diffstat of debian/ for xfce4-session_4.8.2-3 xfce4-session_4.8.3-0ubuntu2 README.Debian | 2 changelog | 865 +++++++++++++ compat | 2 control | 9 maintscript | 1 manpages | 1 patches/series | 2 patches/xubuntu_ignore-gdm-lang.patch | 23 patches/xubuntu_lock-the-screen-on-hibernate-suspend.patch | 104 + postinst | 3 postrm | 8 preinst | 3 rules | 31 xfce4-autostart-editor.1 | 18 xfce4-session.lintian-overrides | 2 15 files changed, 1016 insertions(+), 58 deletions(-) diff -Nru xfce4-session-4.8.2/debian/README.Debian xfce4-session-4.8.3/debian/README.Debian --- xfce4-session-4.8.2/debian/README.Debian 2011-08-09 12:00:11.000000000 +0000 +++ xfce4-session-4.8.3/debian/README.Debian 2012-02-12 16:50:59.000000000 +0000 @@ -32,6 +32,6 @@ There are two ways to enable user to shutdown the computer from Xfce: - - use sudo, and allow user to run /usr/lib/xfce4/session/xfsm-shutdown-helper + - use sudo, and allow user to run /usr/lib/*/xfce4/session/xfsm-shutdown-helper - use policykit and a compatible login manager (lightdm and gdm are known to work, startx too if you use the tips above) diff -Nru xfce4-session-4.8.2/debian/changelog xfce4-session-4.8.3/debian/changelog --- xfce4-session-4.8.2/debian/changelog 2012-01-02 06:57:32.000000000 +0000 +++ xfce4-session-4.8.3/debian/changelog 2012-02-14 15:30:12.000000000 +0000 @@ -1,3 +1,52 @@ +xfce4-session (4.8.3-0ubuntu2) precise; urgency=low + + * Use maintscript support in dh_installdeb rather than writing out + dpkg-maintscript-helper commands by hand. This adds a Pre-Dependency on + a sufficient version of dpkg. + + -- Colin Watson Tue, 14 Feb 2012 15:30:11 +0000 + +xfce4-session (4.8.3-0ubuntu1) precise; urgency=low + + * New upstream bugfix release. + * debian/rules: + - use debhelper 9 hardening support. + * Fix paths for multiarch dirs. + * debian/compat bumped to 9. + * debian/control: + - drop hardening-includes build-dep. + - update debhelper build-dep to 9 for hardening support. + - add dpkg-dev 1.16.1 build-dep for hardening support. + - pre-depends on multiarch-support. + + -- Lionel Le Folgoc Sun, 12 Feb 2012 23:19:43 +0100 + +xfce4-session (4.8.2-3ubuntu1) precise; urgency=low + + * Merge 4.8.2-2 from Debian testing to harmonize patches, and 4.8.2-3 from + unstable for the small prerm fix, remaining Ubuntu changes: + - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev + to enable GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + - debian/patches: + + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + + 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/xfce4-autostart-editor.1, debian/manpages: dropped, the binary + doesn't exist on Xfce 4.6 and later. lp: #911688 + * debian/patches: + - 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: dropped, + identical to 03_respect-save-settings-logout-plugin.patch. + - xubuntu_lock-the-screen-on-hibernate-suspend.patch: updated to read the + 'lock-screen-suspend-hibernate' xfconf key from xfpm to avoid locking + the screen on suspend/hibernate when the user disabled the feature. + + -- Lionel Le Folgoc Wed, 04 Jan 2012 23:10:40 +0100 + xfce4-session (4.8.2-3) unstable; urgency=low * debian/prerm: @@ -22,6 +71,27 @@ -- Yves-Alexis Perez Tue, 20 Dec 2011 15:51:07 +0100 +xfce4-session (4.8.2-1ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev + to enable GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + - debian/patches: + + 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: let the + logout panel plugin use the /general/SaveOnExit property. lp: #831772 + + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + + 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. + + series: apply these patches. + * debian/patches/xubuntu_ignore-gdm-lang.patch: refreshed to apply cleanly. + * This new bugfix release includes updated translations. lp: #781056 + + -- Lionel Le Folgoc Thu, 15 Sep 2011 00:05:42 +0200 + xfce4-session (4.8.2-1) unstable; urgency=low * New upstream release. @@ -39,6 +109,32 @@ -- Yves-Alexis Perez Wed, 14 Sep 2011 00:01:16 +0200 +xfce4-session (4.8.1-4ubuntu2) oneiric; urgency=low + + * debian/patches: + - 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: let + the logout panel plugin use the /general/SaveOnExit property. lp: #831772 + - series: enable it. + + -- Lionel Le Folgoc Fri, 09 Sep 2011 22:39:46 +0200 + +xfce4-session (4.8.1-4ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable for the FTBFS fix, remaining Ubuntu changes: + - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev + to enable GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + - debian/patches: + + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + + 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. + + series: apply these patches. + + -- Lionel Le Folgoc Wed, 07 Sep 2011 00:04:08 +0200 + xfce4-session (4.8.1-4) unstable; urgency=low * debian/README.Debian updated @@ -53,6 +149,23 @@ -- Yves-Alexis Perez Sun, 04 Sep 2011 21:51:37 +0200 +xfce4-session (4.8.1-3ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev + to enable GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + - debian/patches: + + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + + 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. + + series: apply these patches. + + -- Lionel Le Folgoc Sun, 26 Jun 2011 21:54:49 +0200 + xfce4-session (4.8.1-3) unstable; urgency=low * debian/patches: @@ -74,6 +187,33 @@ -- Yves-Alexis Perez Tue, 19 Apr 2011 16:39:47 +0200 +xfce4-session (4.8.1-1ubuntu2) natty; urgency=low + + * 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. + - series: add this patch. + + -- Lionel Le Folgoc Thu, 24 Mar 2011 20:01:04 +0100 + +xfce4-session (4.8.1-1ubuntu1) natty; urgency=low + + * Merge from Debian experimental, remaining Ubuntu changes: + - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev + to enable GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + - debian/patches: + + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + + xubuntu_force-xsettings-daemon.patch: start xfsettingsd with --force + to replace a spurious gnome-settings-daemon instance left by gdm. + Revert when gdm is fixed. lp: #709148 + + series: apply these patches. + + -- Lionel Le Folgoc Sat, 19 Feb 2011 12:23:14 +0100 + xfce4-session (4.8.1-1) experimental; urgency=low [ Yves-Alexis Perez ] @@ -123,6 +263,98 @@ -- Yves-Alexis Perez Tue, 15 Feb 2011 00:18:12 +0100 +xfce4-session (4.8.1-0ubuntu1) natty; urgency=low + + * New upstream release. + + -- Lionel Le Folgoc Mon, 14 Feb 2011 21:55:24 +0100 + +xfce4-session (4.8.0-0ubuntu2) natty; urgency=low + + * debian/control: drop fortunes-mod from depends, xfce4-session uses an + internal implementation. Move it to Suggests so people can still use it + for real fortunes. lp: #707091 + * debian/patches: + - xubuntu_force-xsettings-daemon.patch: start xfsettingsd with --force + to replace a spurious gnome-settings-daemon instance left by gdm. + Revert when gdm is fixed. lp: #709148 + - series: apply this patch. + + -- Lionel Le Folgoc Sat, 29 Jan 2011 14:53:50 +0100 + +xfce4-session (4.8.0-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/control: bump minimum required versions for Xfce 4.8 libs. + + -- Lionel Le Folgoc Sun, 23 Jan 2011 14:51:33 +0100 + +xfce4-session (4.7.3-0ubuntu2) natty; urgency=low + + * debian/patches: + - xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior + of xfce4-power-manager for consistency. + - series: refreshed. + + -- Lionel Le Folgoc Sun, 09 Jan 2011 22:46:06 +0100 + +xfce4-session (4.7.3-0ubuntu1) natty; urgency=low + + * New upstream development release. + * Bump xfce4-panel-dev b-dep to >= 4.7.7 to force using the new abi. + + -- Lionel Le Folgoc Tue, 04 Jan 2011 21:54:52 +0100 + +xfce4-session (4.7.2-0ubuntu1) natty; urgency=low + + * Upload to natty (pkg-xfce svn r4617), remaining Ubuntu changes: + - debian/control: + + use our Vcs-* fields + + build-depends on libgconf2-dev and libgnome-keyring-dev to enable + GNOME services support. + - debian/rules: pass --enable-gnome --enable-libgnome-keyring to + dh_auto_configure. + * Re-enable xfce4-panel support as we have 4.7.x in natty. + + -- Lionel Le Folgoc Sat, 04 Dec 2010 20:42:50 +0100 + +xfce4-session (4.7.2-1) UNRELEASED; urgency=low + + [ Yves-Alexis Perez ] + * New upstream development release. + * debian/patches: + - 02_fix-fortune-path refreshed. + - 04_gk-dont-check-running-use-start refreshed. + * debian/control: + - refresh build-deps for Xfce 4.7. + - add build-dep on hardening-includes. + * debian/rules: + - don't pass libexecdir, useless now + - update xfsm-shutdown-helper path in chrpath call. + - update splash-engine path. + - pick {C,LD}FLAGS from dpkg-buildflags. + - add hardening flags to {C,LD}FLAGS. + * debian/xfce4-session.lintian-overrides: + - drop xfsm-shutdown-helper and balou theme overrides, useless now. + + [ Lionel Le Folgoc ] + * debian/control: + - add myself to Uploaders + - change hal recommends to upower and consolekit. + * debian/patches/05_reuse-existing-ck-session.patch: do not open a new + consolekit session if one is already present (Xfce #6685) + * Bugs fixed by 4.7.x/4.8.x series: + - Cannot edit an item in Autostarted applications dialog lp: #245171 + - Does not use the ConsoleKit interface to shutdown or reboot lp: #496423 + - Fails to request necessary permissions from policykit to perform + shutdown/restart when multiple users are logged in lp: #251337 + * debian/patches: + - 03_gk-start-with-path.patch: dropped, included upstream + - 04_gk-dont-check-running-use-start.patch: ditto + - 05_reuse-existing-ck-session.patch: dropped too. + + -- Yves-Alexis Perez Fri, 03 Dec 2010 23:02:31 +0100 + xfce4-session (4.6.2-2) unstable; urgency=low * debian/patches: @@ -134,6 +366,38 @@ -- Yves-Alexis Perez Sat, 04 Sep 2010 18:42:53 +0200 +xfce4-session (4.6.2-1ubuntu2) maverick; urgency=low + + * Import bugfixes from pkg-xfce's svn (will fix lp: #564831): + - debian/patches: + + 03_gk-start-with-path and 04_gk-dont-check-running-use-start added, + change the way it starts gnome-keyring so it correctly runs in the + session and exports environment variables. closes: #523322 + * debian/patches/xubuntu_gnome-keyring-daemon-compat.patch: dropped, improper + fix for the same issue. + * debian/patches/series: refreshed. + + -- Lionel Le Folgoc Sat, 04 Sep 2010 18:55:45 +0200 + +xfce4-session (4.6.2-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: use our Vcs-* fields + - debian/patches: + + xubuntu_gnome-keyring-daemon-compat.patch: don't spawn + gnome-keyring-daemon manually. lp #357346 + + series: refreshed + - enable GNOME services support: + + debian/rules: pass --enable-gnome + + debian/control: b-d on libgconf2-dev. + + * debian/patches/02_xubuntu_splash.patch: dropped, unused and unmaintained. + * debian/patches/08_no_tips_on_startup.patch: dropped, should be moved to + $derivative-default-settings. + * debian/patches/09_fix-typo-logout-dialog.patch: dropped, included upstream. + + -- Lionel Le Folgoc Mon, 24 May 2010 00:05:36 +0200 + xfce4-session (4.6.2-1) unstable; urgency=low [Stefan Ott] @@ -157,6 +421,41 @@ -- Yves-Alexis Perez Sun, 23 May 2010 13:55:01 +0200 +xfce4-session (4.6.1-1ubuntu3) lucid; urgency=low + + * debian/control: refresh Vcs-* fields for lucid. + * debian/patches/xubuntu_gnome-keyring-daemon-compat.patch: don't spawn + gnome-keyring-daemon manually. lp: #357346 + * debian/patches/series: include it. + + -- Lionel Le Folgoc Sat, 20 Feb 2010 20:35:05 +0100 + +xfce4-session (4.6.1-1ubuntu2) karmic; urgency=low + + * debian/patches: + - 09_fix-typo-logout-dialog.patch: remove an extra character that breaks + formatting with de_DE locale (LP: #431849) + - series: include this new patch. + + -- Lionel Le Folgoc Sat, 19 Sep 2009 12:09:38 +0200 + +xfce4-session (4.6.1-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: use our Vcs-* fields + - debian/patches: + + 02_xubuntu_splash.patch: install the xubuntu session splash + + 08_no_tips_on_startup.patch: don't show the tips screen on first log in + + series: refreshed + - enable GNOME services support: + + debian/rules: pass --enable-gnome + + debian/control: b-d on libgconf2-dev. + * debian/patches: + - 07_fix-autostart-editor-crash.patch: dropped, fixed upstream another way + - 09_xfce4-session-enabletcp-defaultvalue.patch: dropped, included upstream. + + -- Lionel Le Folgoc Mon, 01 Jun 2009 00:20:53 +0200 + xfce4-session (4.6.1-1) unstable; urgency=low * New upstream release. @@ -179,6 +478,31 @@ -- Yves-Alexis Perez Sat, 04 Apr 2009 01:26:03 +0200 +xfce4-session (4.6.0-1ubuntu2) jaunty; urgency=low + + * debian/patches/: + - 09_xfce4-session-enabletcp-defaultvalue.patch: disable by default + security/EnableTcp property ("Manage remote connections"), Xfce #5126. + - series: refreshed. + + -- Lionel Le Folgoc Mon, 13 Apr 2009 15:54:51 +0200 + +xfce4-session (4.6.0-1ubuntu1) jaunty; urgency=low + + * Merge Xfce 4.6.0 final with Debian experimental, remaining Ubuntu changes: + - debian/control: use our Vcs-* fields + - debian/patches: + + 02_xubuntu_splash.patch: install the xubuntu session splash + + 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor crash + with desktop files containing a "Type" which is not "Application" + + 08_no_tips_on_startup.patch: don't show the tips screen on first log in + + series: refreshed + - enable GNOME services support: + + debian/rules: pass --enable-gnome + + debian/control: b-d on libgconf2-dev. + + -- Lionel Le Folgoc Sun, 01 Mar 2009 18:33:28 +0100 + xfce4-session (4.6.0-1) experimental; urgency=low [ Xfce 4.6 Alpha “Pinkie”] @@ -252,6 +576,199 @@ -- Yves-Alexis Perez Sat, 28 Feb 2009 13:01:12 +0100 +xfce4-session (4.5.99.1-0ubuntu2) jaunty; urgency=low + + * debian/patches/08_no_tips_on_startup.patch: + - Don't show the tips screen on first log in. + + -- Mario Limonciello Sun, 15 Feb 2009 17:07:03 -0600 + +xfce4-session (4.5.99.1-0ubuntu1) jaunty; urgency=low + + * Merge from Debian pkg-xfce UNRELEASED (r2639). Remaining Ubuntu changes: + - debian/control: use our Vcs-* fields + - debian/rules: do not install a desktop-base config file, it'll be shipped + by xubuntu-default-settings. + - debian/patches/02_xubuntu_splash.patch: install the xubuntu session + splash (updated to apply cleanly). + - debian/patches/07_fix-autostart-editor-crash.patch: fix a + xfce4-autostart-editor crash with desktop files containing a "Type" which + is not "Application" (updated to apply cleanly. + - debian/patches/series: refreshed. + - enable GNOME services support: + + debian/rules: pass --enable-gnome + + debian/control: b-d on libgconf2-dev. + * Bugs fixed by this new release: + - "[edgy] Spelling mistake in error message." (LP: #64477) + + -- Lionel Le Folgoc Fri, 06 Feb 2009 14:58:36 +0100 + +xfce4-session (4.5.99.1-1) UNRELEASED; urgency=low + + [ Xfce 4.6 Alpha “Pinkie”] + * new upstream alpha release. + - xfce4-session now has a way to edit autostarted apps. closes: #507948 + * debian/control: + - 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. + - remove dep on xfce4-mcs-manager and replace it by xfconf, + xfce4-settings. + - explicitely add build-dep on libdbus-glib-1-dev. + * debian/patches: + - 06_rephrase-tips removed. + - 07_parallel-startup added, taken from upstream r28005. + + [ Xfce 4.6 Beta 1 “Fuzzy”] + * new upstream beta release + * debian/control: + - update build-deps for Fuzzy. + - add build dep on libxfconf-0-dev, libglade2-dev. + - update build-dep on debhelper for a version with dh_lintian + * debian/patches: + - 02_use-mice-as-default-engine dropped. + - 07_parallel-startup removed, included upstream. + - 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. + * debian/rules: + - don't manually install lintian overrides, use dh_lintian + * debian/lintian: + - renamed to debian/xfce4-session.lintian-overrides. + - updated to match Fuzzy. + + [ Xfce 4.6 Beta 2 “Hopper”] + * new upstream beta release + * debian/control: + - update build-deps for Hopper. + * debian/xfce4-session.xml: + - now that simple engine configuration is handled is xfconf, provide a + desktop-base config file. + * debian/patches: + - 03_fix-suspend-errors-at-resume added, fix errors when resuming. + * debian/xfce4-session.lintian-overrides: + - update link for beta2. + + [ Xfce 4.6 Beta 3 “Tuco-tuco”] + * new upstream beta release. + * debian/control: + - update build-deps for “Tuco-Tuco”. + * debian/patches: + - 02_xfce4-session-logout-manpage-typo dropped. + - 03_fix-suspend-errors-at-resume as well. + + [ Xfce 4.6 RC1 “Capybara” ] + * new upstream release candidate. + * debian/control: + - update build-deps for “Capybara”. + + -- Yves-Alexis Perez Mon, 26 Jan 2009 13:00:06 +0100 + +xfce4-session (4.4.3-0ubuntu3) jaunty; urgency=low + + * Fix broken translations (LP: #313688): + - debian/rules, debian/xubuntu-po/*: don't install these files, they contain + broken strings + - debian/patches/xubuntu-fix-logout-dialog-translations.patch: use this + minimal patch instead (taken from hardy-updates and slightly updated to + apply cleanly). + + -- Lionel Le Folgoc Sat, 17 Jan 2009 19:46:32 +0100 + +xfce4-session (4.4.3-0ubuntu2) jaunty; urgency=low + + * Add 09_gnome_keyring_daemon_2_25_compat.patch which prevents + xfce4-session from spawning gnome-keyring-daemon on it's own. + It gets spawned by PAM during login, so it shouldn't be started + again by XFCE. (LP: #316222) + + -- Mario Limonciello Tue, 13 Jan 2009 15:18:45 -0600 + +xfce4-session (4.4.3-0ubuntu1) jaunty; urgency=low + + * Merge with Debian Xfce SVN UNRELASED, Ubuntu changes remaining: + - debian/patches: + + add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate + & 'switch user' options to logout dialog + + add 02_xubuntu_splash.patch: install the xubuntu session splash + + add 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor + crash with desktop files containing a "Type" which is not + "Application" + + xubuntu-default-config.patch: default GNOME services set to true to + have accessibility services launched if installed + + series: refreshed + - debian/pixmaps/*, debian/rules: add a menu icon (from Jozsef Mak) for + the autostart-editor and icons for the logout dialog + - debian/rules: + + remove the config files, shipped with xubuntu-default-settings + + do not ship uneeded icons + + add "NoDisplay=true" to desktop files to hide them by default + + pass --enable-gnome to configure scrips + + replace upstream po files with xubuntu specific ones + - debian/control: + + build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils + + depends on hal instead of recommends + - debian/xubuntu-po/*: ship xubuntu-specific po files. + * Rearranged rules to make lintian happy + * debian/control: + + Changed build-deps xbase-clients -> libx11-dev + x11-xserver-utils + libice-dev + + xfce4-session: added dependency on x11-xserver-utils + * debian/patches: + + add 06_fix-es-translation.patch: dropped, merged upstream + + 99_configure.patch: refreshed + + -- Michael Casadevall Mon, 10 Nov 2008 16:48:56 -0500 + +xfce4-session (4.4.3-1) UNRELEASED; urgency=low + + * new upstream bugfix release + * debian/patches: + - 07_startup-speed added, speed up startup by not waiting for forks(). + - series edited to correctly include 06_rephrase-tip. + - 08_fix-fortune-path added, use absolute path when calling fortune. + closes: #497199 + * debian/control: + - add build-dep on intltool. + + -- Yves-Alexis Perez Tue, 28 Oct 2008 11:40:46 +0100 + +xfce4-session (4.4.2-6ubuntu2) intrepid; urgency=low + + * debian/xubuntu-po/*: ship xubuntu-specific po files. + * debian/rules: replace upstream po files with them (LP: #228784) + + -- Lionel Le Folgoc Sun, 08 Jun 2008 13:51:11 +0200 + +xfce4-session (4.4.2-6ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches: + + add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate + & 'switch user' options to logout dialog + + add 02_xubuntu_splash.patch: install the xubuntu session splash + + add 06_fix-es-translation.patch: fix two broken strings + + add 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor + crash with desktop files containing a "Type" which is not + "Application" + + xubuntu-default-config.patch: default GNOME services set to true to + have accessibility services launched if installed + + series: refreshed + - debian/pixmaps/*, debian/rules: add a menu icon (from Jozsef Mak) for + the autostart-editor and icons for the logout dialog + - debian/rules: + + remove the config files, shipped with xubuntu-default-settings + + do not ship uneeded icons + + add "NoDisplay=true" to desktop files to hide them by default + + pass --enable-gnome to configure scrips + - debian/control: + + adhere to DebianMaintainerField + + build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils + + depends on hal instead of recommends + + -- Gauvain Pocentek Wed, 21 May 2008 17:59:33 +0200 + xfce4-session (4.4.2-6) unstable; urgency=low * debian/{postinst,prerm}: have them back, they manage the x-session-manager @@ -284,6 +801,47 @@ -- Yves-Alexis Perez Sun, 27 Apr 2008 17:49:34 +0200 +xfce4-session (4.4.2-2ubuntu2) hardy; urgency=low + + * debian/patches: + - 06_fix-es-translation.patch: fix two broken strings (LP: #214857) + - 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor crash + with desktop files containing a "Type" which is not "Application", thanks + Urs Fleisch for the patch (LP: #206867) + - series: refreshed. + + -- Lionel Le Folgoc Mon, 14 Apr 2008 12:21:31 +0200 + +xfce4-session (4.4.2-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: + + add 00_logout_dialog.patch, 99_configure.patch: add suspend/hibernate & + 'switch user' options to logout dialog + + 02_use-mice-as-default-engine.patch: dropped, we don't enable any + splash by default + + add 02_xubuntu_splash.patch: install the xubuntu session splash + + xubuntu-default-config.patch (formerly 05_default_config.patch): + default GNOME services set to true to have accessibility services + launched if installed + - debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu + icon (from Jozsef Mak) for the autostart-editor + - debian/rules: pass --enable-gnome to configure scripts, and do not ship + uneeded config files and icons + - debian/control: + + adhere to DebianMaintainerField + + build-depend on libdbus-glib-1-dev, libgconf2-dev, sharutils + + depends on hal instead of recommends + + drop conflicts on desktop-base (<< 0.3.20). + * debian/rules: + - do not install the .desktop files which only create dups of the settings + manager items + - drop empty dirs. + * debian/lintian: drop unused overrides. + * debian/patches/series: refreshed. + + -- Lionel Le Folgoc Sat, 01 Mar 2008 19:16:17 +0100 + xfce4-session (4.4.2-2) unstable; urgency=low * debian/copyright: don't ship complete GFDL text. @@ -303,6 +861,34 @@ -- Yves-Alexis Perez Thu, 28 Feb 2008 20:46:13 +0100 +xfce4-session (4.4.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - use our xfce.mk class + - debian/patches/00_logout_dialog.patch: add suspend/hibernate & 'switch user' + options to logout dialog + - debian/patches/02_use-mice-as-default-engine.patch: dropped, we don't + enable any splash by default + - debian/patches/02_xubuntu_splash.patch: install the xubuntu session splash + - debian/patches/05_default_config.patch: default GNOME services set to + true to have accessibility services launched if installed + - debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu + icon (from Jozsef Mak) for the autostart-editor + - debian/patches/series:dropped, we don't use quilt + - debian/compat: bump to 5 + - debian/control: + + update Maintainer field + + update the Vcs-* headers + + bump debhelper b-d to >= 5, add libdbus-glib-1-dev, libgconf2-dev, + sharutils and drop quilt, chrpath, fortune-mod & libdbus-1-dev + + depend on hal instead of recommend + + do not conflict on desktop-base (<< 0.3.20). + * debian/control: b-d on autotools-dev. + * debian/patches/02_xubuntu_splash.patch, debian/patches/99_configure.patch: + updated. + + -- Lionel Le Folgoc Fri, 07 Dec 2007 19:07:15 +0100 + xfce4-session (4.4.2-1) unstable; urgency=low [ Yves-Alexis Perez ] @@ -315,6 +901,53 @@ -- Simon Huggins Tue, 27 Nov 2007 16:39:19 +0000 +xfce4-session (4.4.1-2ubuntu2) hardy; urgency=low + + [ Cody A.W. Somerville ] + * debian/watch: Added from 4.4.1-2 + * debian/patches/01_correct_shadows.patch: Re-added + * debian/postinst: Removed debian delta + * debian/control: Reduced debian delta + + [ Lionel Le Folgoc ] + * debian/control: + - add XS-Vcs-Bzr & XS-Vcs-Browser fields + - don't recommend procps anymore + - bump debhelper b-d to >= 5. + * debian/compat: bump to 5. + * debian/rules: don't remove xfsm-shutdown-helper. + + -- Lionel Le Folgoc Tue, 06 Nov 2007 22:15:13 +0100 + +xfce4-session (4.4.1-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/patches/00_logout_dialog.patch + . add suspend/hibernate options to logout dialog + . add 'switch user' button to the logout dialog. + . updated to include a call to _() + . split the row of buttons into two + - debian/patches/02_xubuntu_splash.patch + + Install the xubuntu session splash + - debian/patches/05_default_config.patch + . Default GNOME services set to true to have accessibility + services launched if installed + - debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules + . a menu icon (from Jozsef Mak) for the autostart-editor + - debian/rules: Use cdbs with xfce.mk + - debian/control: + . Update Maintainer field + . Depend on hal instead of recommend + . Recommend procps + . Conflicts & Replaces xfce4-toys + * Added debian/patches/02_xubuntu_splash.patch from edgy + LP: #148400 + * Removed obsolete patches: + - debian/patches/01_correct_shadows.patch + - debian/patches/02_use-mice-as-default-engine.patch + + -- Cody A.W. Somerville Mon, 05 Nov 2007 19:30:08 -0400 + xfce4-session (4.4.1-2) unstable; urgency=low [ Yves-Alexis Perez ] @@ -333,6 +966,39 @@ -- Simon Huggins Sat, 20 Oct 2007 12:47:13 +0100 +xfce4-session (4.4.1-1ubuntu4) gutsy; urgency=low + + * debian/patches/00_logout_dialog.patch: split the row of buttons into two. + (LP: #138485) + + -- Lionel Le Folgoc Mon, 10 Sep 2007 15:26:03 +0200 + +xfce4-session (4.4.1-1ubuntu3) gutsy; urgency=low + + * debian/pixmaps/xfce4-autostart-editor.png.uue, debian/rules: add a menu + icon (from Jozsef Mak) for the autostart-editor. (LP: #58251,#105493) + + -- Lionel Le Folgoc Thu, 06 Sep 2007 10:56:27 +0200 + +xfce4-session (4.4.1-1ubuntu2) gutsy; urgency=low + + * debian/patches/00_logout_dialog.patch: updated to include a call to _(), + otherwise the buttons aren't translated. (LP: #93553) + + -- Lionel Le Folgoc Sun, 26 Aug 2007 15:38:18 +0200 + +xfce4-session (4.4.1-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/00_logout_dialog.patch: + . add suspend/hibernate options to logout dialog + . add 'switch user' button to the logout dialog. + - debian/patches/03_default_config.patch: Default GNOME compatibility + to true to have accessibility services launched if installed + - use cdbs with xfce.mk + + -- Gauvain Pocentek Sat, 5 May 2007 15:20:07 +0200 + xfce4-session (4.4.1-1) unstable; urgency=low * New upstream release. @@ -355,6 +1021,28 @@ -- Yves-Alexis Perez Sun, 04 Feb 2007 13:15:38 +0100 +xfce4-session (4.4.0-0ubuntu3) feisty; urgency=low + + * debian/patches/02_xubuntu_splash.patch: + Drop xubuntu splash animation, we are not using it anyway + * debian/patches/00_logout_dialog.patch: + Add 'switch user' button to the logout dialog. + * debian/control: Update Maintainer field + + -- Jani Monoses Tue, 20 Mar 2007 14:06:19 +0200 + +xfce4-session (4.4.0-0ubuntu2) feisty; urgency=low + + * 00_suspend_hibernate.patch: add missing configuration bits + + -- Gauvain Pocentek Mon, 12 Feb 2007 22:00:21 +0100 + +xfce4-session (4.4.0-0ubuntu1) feisty; urgency=low + + * New upstream release + + -- Gauvain Pocentek Tue, 23 Jan 2007 11:06:30 +0100 + xfce4-session (4.3.99.2-3) unstable; urgency=low * Ship a xfce4-session.rc for failsafe session but use a default splash @@ -381,6 +1069,15 @@ -- Yves-Alexis Perez Mon, 27 Nov 2006 08:41:39 +0100 +xfce4-session (4.3.99.2-0ubuntu1) feisty; urgency=low + + * New upstream release, part of Xfce 4.4 RC2 + * 01_drop_libgnome.patch: dropped, included upstream + * 00_suspend_hibernate.patch, 03_default_config.patch, + 02_xubuntu_splash.patch, 99_configure.patch: updated + + -- Gauvain Pocentek Tue, 2 Jan 2007 16:15:18 +0100 + xfce4-session (4.3.99.1-1) unstable; urgency=low * New upstream release. @@ -388,6 +1085,65 @@ -- Yves-Alexis Perez Sat, 23 Sep 2006 13:42:51 +0100 +xfce4-session (4.3.90.2svn+r22852-0ubuntu5) edgy; urgency=low + + * debian/patches/03_default_config.patch: Default GNOME compatibility + to true to have accessibility services launched if installed + + -- Jani Monoses Fri, 20 Oct 2006 23:48:57 +0300 + +xfce4-session (4.3.90.2svn+r22852-0ubuntu4) edgy; urgency=low + + * debian/patches/00_suspend_hibernate.patch: Disable sleep hotkey + leave that to gnome-power-manager if installed + * debian/patches/03_default_config: Add entries for GNOME/KDE compatibility + defaulting to false. + + -- Jani Monoses Mon, 16 Oct 2006 11:59:15 +0300 + +xfce4-session (4.3.90.2svn+r22852-0ubuntu3) edgy; urgency=low + + * debian/patches/03_disable_splash.patch: + Disable splash screen at startup as it slows things down. + + -- Jani Monoses Wed, 11 Oct 2006 21:55:44 +0300 + +xfce4-session (4.3.90.2svn+r22852-0ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 13:15:56 +0200 + +xfce4-session (4.3.90.2svn+r22852-0ubuntu1) edgy; urgency=low + + * New svn snapshot, HAL support for shutdown/reboot patch merged + upstream. Provide our remaining changes as proper patches. + * debian/patches/00_suspend_hibernate: + -add suspend/hibernate options to logout dialog + -provide toggles in the session settings dialog for disabling these buttons + -handle Sleep hotkey via HAL + -fix kiosk mode bug present in previous patches (LP #47834) + * debian/patches/01_drop_libgnome: + -just depend on libgconf instead of full libgnome as the latter is not + actually being used + * debian/patches/02_xubuntu_splash: + -add xubuntu splash animation + * debian/rules: + -in post-install replace the logout dialog buttons provided upstream + with the Human themed buttons from the Ubuntu dialog. + -configure with support for gconf to get accessibility settings + * debian/control: + -build-depend on libgconf2-dev and sharutils + + -- Jani Monoses Wed, 23 Aug 2006 16:59:05 +0300 + +xfce4-session (4.3.90.2svn+r22664-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot (4.4 beta2) + * Add support for laptop sleep button via HAL + + -- Jani Monoses Sat, 5 Aug 2006 13:53:19 +0300 + xfce4-session (4.3.90.2-1) unstable; urgency=low (Yves-Alexis Perez) @@ -399,6 +1155,25 @@ -- Yves-Alexis Perez Mon, 10 Jul 2006 19:25:08 +0200 +xfce4-session (4.3.90.1svn+r21697-0ubuntu2) edgy; urgency=low + + * Bump standards version to 3.7.2 + * Bump library depends to 4.3.90.2 + + -- Jani Monoses Wed, 12 Jul 2006 15:12:13 +0300 + +xfce4-session (4.3.90.1svn+r21697-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (translation updates and bugfixes, including + correct handling of autostart .desktop files - LP #42350, add thunar + to default session) + * Provide the Xubuntu splash screen in addition to, not instead of + the Xfce default one. Use new steel color theme for splash + * Copy the nice logout dialog icons from the Human theme + * Bump version and depends to 4.3.90.1 + + -- Jani Monoses Tue, 16 May 2006 10:49:46 +0300 + xfce4-session (4.3.90.1-1) unstable; urgency=low (Yves-Alexis Perez) @@ -409,6 +1184,96 @@ -- Yves-Alexis Perez Wed, 03 May 2006 18:35:05 +0100 +xfce4-session (4.3.0svn+r20111-0ubuntu9) dapper; urgency=low + + * Rebuild for new libxfce4util + + -- Jani Monoses Tue, 9 May 2006 00:15:44 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu8) dapper; urgency=low + + * Do not show tips at startup + + -- Jani Monoses Thu, 27 Apr 2006 19:42:30 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu7) dapper; urgency=low + + * Fix widgets in logout dialog sometimes getting unclickable + even if focused. + + -- Jani Monoses Thu, 13 Apr 2006 18:18:40 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu6) dapper; urgency=low + + * Depend on fortune-mod as it is used for displaying the tips. + + -- Jani Monoses Tue, 4 Apr 2006 21:17:32 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu5) dapper; urgency=low + + * Check reply when talking to HAL and do not print warning + messages about not being able to shutdown when in fact we are. + + -- Jani Monoses Thu, 30 Mar 2006 14:59:52 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu4) dapper; urgency=low + + * Use xfce CDBS class which generates POT file and adds .desktop + entries for langpack support + + -- Jani Monoses Tue, 28 Mar 2006 09:39:21 +0300 + +xfce4-session (4.3.0svn+r20111-0ubuntu3) dapper; urgency=low + + * Add suspend/hibernate buttons to logout dialog and + user settings to disable them. + + -- Jani Monoses Sat, 18 Mar 2006 14:41:10 +0200 + +xfce4-session (4.3.0svn+r20111-0ubuntu2) dapper; urgency=low + + * Do not suggest sudo anymore + * Add preview image for xubuntu session splash screen + + -- Jani Monoses Tue, 28 Feb 2006 14:53:09 +0200 + +xfce4-session (4.3.0svn+r20111-0ubuntu1) dapper; urgency=low + + * Convert to CDBS packaging + * Move helper binaries to usr/lib/xfce4 instead of /usr/sbin + * Build depend on libdbus, depend on HAL + * Use HAL for shutdown/restart in session logout + + -- Jani Monoses Sun, 26 Feb 2006 21:01:13 +0200 + +xfce4-session (4.3.0svn+r19988-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Conflict/Replace xfce4-toys + * No longer recommend xfce4-iconbox + + -- Jani Monoses Wed, 22 Feb 2006 13:58:26 +0200 + +xfce4-session (4.3.0svn+r19871-0ubuntu2) dapper; urgency=low + + * Add libxml-parser-perl as build dependency + + -- Jani Monoses Wed, 15 Feb 2006 22:35:42 +0200 + +xfce4-session (4.3.0svn+r19871-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Bump all depends to 4.3 + + -- Jani Monoses Wed, 15 Feb 2006 16:25:34 +0200 + +xfce4-session (4.3.0svn+r19775-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * UVF exception granted + + -- Jani Monoses Wed, 15 Feb 2006 12:52:04 +0200 + xfce4-session (4.2.3-1) unstable; urgency=low * New Upstream Release diff -Nru xfce4-session-4.8.2/debian/compat xfce4-session-4.8.3/debian/compat --- xfce4-session-4.8.2/debian/compat 2009-03-15 14:28:16.000000000 +0000 +++ xfce4-session-4.8.3/debian/compat 2012-02-12 16:40:15.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru xfce4-session-4.8.2/debian/control xfce4-session-4.8.3/debian/control --- xfce4-session-4.8.2/debian/control 2011-09-04 19:51:35.000000000 +0000 +++ xfce4-session-4.8.3/debian/control 2012-02-14 15:10:49.000000000 +0000 @@ -1,13 +1,15 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc -Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxml-parser-perl, chrpath, +Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, chrpath, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, xfce4-panel-dev (>= 4.8.0), libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), libwnck-dev, x11-xserver-utils, libxfconf-0-dev (>= 4.8.0), libglade2-dev, - intltool (>= 0.31), hardening-includes, xfce4-dev-tools, libtool + libgconf2-dev, libgnome-keyring-dev, + intltool (>= 0.31), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool Standards-Version: 3.9.2 Homepage: http://www.xfce.org/ Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/ @@ -16,6 +18,7 @@ Package: xfce4-session Section: xfce Architecture: any +Pre-Depends: ${misc:Pre-Depends}, multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings, xfconf Recommends: xfwm4, xfce4-utils, xfdesktop4, ${shlibs:Recommends}, consolekit, upower, dbus-x11, x11-xserver-utils diff -Nru xfce4-session-4.8.2/debian/maintscript xfce4-session-4.8.3/debian/maintscript --- xfce4-session-4.8.2/debian/maintscript 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.8.3/debian/maintscript 2012-02-14 15:10:25.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 diff -Nru xfce4-session-4.8.2/debian/manpages xfce4-session-4.8.3/debian/manpages --- xfce4-session-4.8.2/debian/manpages 2010-05-22 16:47:26.000000000 +0000 +++ xfce4-session-4.8.3/debian/manpages 2012-01-04 21:15:57.000000000 +0000 @@ -1,3 +1,2 @@ -debian/xfce4-autostart-editor.1 debian/xfce4-tips.1 debian/xfce4-session-settings.1 diff -Nru xfce4-session-4.8.2/debian/patches/series xfce4-session-4.8.3/debian/patches/series --- xfce4-session-4.8.2/debian/patches/series 2011-12-17 19:02:29.000000000 +0000 +++ xfce4-session-4.8.3/debian/patches/series 2012-02-12 22:09:36.000000000 +0000 @@ -2,3 +2,5 @@ 03_respect-save-settings-logout-plugin.patch 04_fix-missing-lm.patch 05_force-xfsettingsd-start.patch +xubuntu_lock-the-screen-on-hibernate-suspend.patch +xubuntu_ignore-gdm-lang.patch diff -Nru xfce4-session-4.8.2/debian/patches/xubuntu_ignore-gdm-lang.patch xfce4-session-4.8.3/debian/patches/xubuntu_ignore-gdm-lang.patch --- xfce4-session-4.8.2/debian/patches/xubuntu_ignore-gdm-lang.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.8.3/debian/patches/xubuntu_ignore-gdm-lang.patch 2011-09-14 22:03:48.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 */ + xfce_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) +- { +- xfce_setenv ("LANG", lang, TRUE); +- xfce_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.8.2/debian/patches/xubuntu_lock-the-screen-on-hibernate-suspend.patch xfce4-session-4.8.3/debian/patches/xubuntu_lock-the-screen-on-hibernate-suspend.patch --- xfce4-session-4.8.2/debian/patches/xubuntu_lock-the-screen-on-hibernate-suspend.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.8.3/debian/patches/xubuntu_lock-the-screen-on-hibernate-suspend.patch 2012-01-04 22:19:13.000000000 +0000 @@ -0,0 +1,104 @@ +From a7b2b781edc969a72fd321174839754afd4d0e0b Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc +Date: Thu, 23 Dec 2010 23:18:40 +0100 +Subject: Lock the screen on hibernate/suspend + +--- + xfce4-session/xfsm-shutdown-helper.c | 60 ++++++++++++++++++++++++++++++++++ + 1 files changed, 60 insertions(+), 0 deletions(-) + +diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c +index 3debeb2..15a72dd 100644 +--- a/xfce4-session/xfsm-shutdown-helper.c ++++ b/xfce4-session/xfsm-shutdown-helper.c +@@ -69,6 +69,8 @@ + #include + #include + ++#include ++ + #include + + #include "xfsm-shutdown-helper.h" +@@ -1778,6 +1780,60 @@ gboolean xfsm_shutdown_helper_restart (XfsmShutdownHelper *helper, GError **erro + } + + /** ++ * Try different ways to lock the screen, taken from xfce4-power-manager. ++ * ++ **/ ++static void ++xfsm_lock_screen (void) ++{ ++ GError *error = NULL; ++ XfconfChannel *channel; ++ gboolean ret; ++ ++ if (G_UNLIKELY (!xfconf_init (&error))) ++ { ++ g_warning ("Unable to contact settings server: %s", error->message); ++ g_error_free (error); ++ ret = TRUE; ++ } ++ else ++ { ++ channel = xfconf_channel_get ("xfce4-power-manager"); ++ ret = xfconf_channel_get_bool (channel, "/xfce4-power-manager/lock-screen-suspend-hibernate", TRUE); ++ xfconf_shutdown (); ++ } ++ ++ /* the user disabled screen locking in xfpm */ ++ if ( !ret ) ++ { ++ return; ++ } ++ ++ ret = g_spawn_command_line_async ("xflock4", NULL); ++ ++ if ( !ret ) ++ { ++ g_spawn_command_line_async ("gnome-screensaver-command -l", NULL); ++ } ++ ++ if ( !ret ) ++ { ++ /* this should be the default*/ ++ ret = g_spawn_command_line_async ("xdg-screensaver lock", NULL); ++ } ++ ++ if ( !ret ) ++ { ++ ret = g_spawn_command_line_async ("xscreensaver-command -lock", NULL); ++ } ++ ++ if ( !ret ) ++ { ++ g_critical ("Cannot lock screen\n"); ++ } ++} ++ ++/** + * xfsm_shutdown_helper_suspend: + * + **/ +@@ -1785,6 +1841,8 @@ gboolean xfsm_shutdown_helper_suspend (XfsmShutdownHelper *helper, GError **erro + { + g_return_val_if_fail (!error || !*error, FALSE); + ++ xfsm_lock_screen (); ++ + #ifdef ENABLE_UPOWER + if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) + { +@@ -1812,6 +1870,8 @@ gboolean xfsm_shutdown_helper_hibernate (XfsmShutdownHelper *helper, GError **er + { + g_return_val_if_fail (!error || !*error, FALSE); + ++ xfsm_lock_screen (); ++ + #ifdef ENABLE_UPOWER + if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) + { +-- +1.7.2.3 + diff -Nru xfce4-session-4.8.2/debian/postinst xfce4-session-4.8.3/debian/postinst --- xfce4-session-4.8.2/debian/postinst 2011-09-13 21:46:59.000000000 +0000 +++ xfce4-session-4.8.3/debian/postinst 2012-02-14 15:10:32.000000000 +0000 @@ -7,9 +7,6 @@ x-session-manager.1.gz /usr/share/man/man1/xfce4-session.1.gz fi -dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@" - #DEBHELPER# exit 0 diff -Nru xfce4-session-4.8.2/debian/postrm xfce4-session-4.8.3/debian/postrm --- xfce4-session-4.8.2/debian/postrm 2011-09-13 21:46:59.000000000 +0000 +++ xfce4-session-4.8.3/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh -e - -dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@" - -#DEBHELPER# - -exit 0 diff -Nru xfce4-session-4.8.2/debian/preinst xfce4-session-4.8.3/debian/preinst --- xfce4-session-4.8.2/debian/preinst 2011-09-13 21:51:47.000000000 +0000 +++ xfce4-session-4.8.3/debian/preinst 2012-02-14 15:10:29.000000000 +0000 @@ -1,8 +1,5 @@ #!/bin/sh -e -dpkg-maintscript-helper rm_conffile \ - /etc/xdg/autostart/xfce4-tips-autostart.desktop 4.8.1-4 -- "$@" - # Remove symlink for el, replaced by a folder in 4.8.2-1 case "$1" in install|upgrade) diff -Nru xfce4-session-4.8.2/debian/rules xfce4-session-4.8.3/debian/rules --- xfce4-session-4.8.2/debian/rules 2011-09-13 21:46:59.000000000 +0000 +++ xfce4-session-4.8.3/debian/rules 2012-02-12 22:08:48.000000000 +0000 @@ -1,18 +1,11 @@ #!/usr/bin/make -f -include /usr/share/hardening-includes/hardening.make - -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1 -CFLAGS+=$(HARDENING_CFLAGS) - -export CFLAGS LDFLAGS - +export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow override_dh_auto_configure: NOCONFIGURE=1 xdt-autogen - dh_auto_configure + dh_auto_configure -- --enable-gnome --enable-libgnome-keyring find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \; override_dh_auto_clean: @@ -20,14 +13,14 @@ dh_auto_clean override_dh_install: - rm -f debian/tmp/usr/lib/xfce4/session/splash-engines/*.la - rm -f debian/tmp/usr/lib/*.la - rm -f debian/tmp/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.*a + rm -f debian/tmp/usr/lib/*/xfce4/session/splash-engines/*.la + rm -f debian/tmp/usr/lib/*/*.la + rm -f debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.*a chrpath -d -k debian/tmp/usr/bin/* \ - debian/tmp/usr/lib/xfce4/session/xfsm-shutdown-helper \ - debian/tmp/usr/lib/xfce4/session/splash-engines/*so \ - debian/tmp/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so + debian/tmp/usr/lib/*/xfce4/session/xfsm-shutdown-helper \ + debian/tmp/usr/lib/*/xfce4/session/splash-engines/*so \ + debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips strfile debian/tmp/usr/share/xfce4/tips/tips \ @@ -36,11 +29,11 @@ dh_install --fail-missing override_dh_shlibdeps: - dh_shlibdeps -X debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \ - -dRecommends debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends + dh_shlibdeps -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \ + -dRecommends debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends override_dh_makeshlibs: - dh_makeshlibs -X debian/xfce4-session/usr/lib/xfce4/panel/plugins/libxfsm-logout-plugin.so + dh_makeshlibs -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so override_dh_strip: dh_strip --dbg-package=xfce4-session-dbg diff -Nru xfce4-session-4.8.2/debian/xfce4-autostart-editor.1 xfce4-session-4.8.3/debian/xfce4-autostart-editor.1 --- xfce4-session-4.8.2/debian/xfce4-autostart-editor.1 2007-01-26 23:14:36.000000000 +0000 +++ xfce4-session-4.8.3/debian/xfce4-autostart-editor.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -.\" Copyright (C) 2007 Emanuele Rocca -.TH XFCE4-AUTOSTART-EDITOR "1" "January 2007" "xfce4-autostart-editor" "User Commands" -.SH NAME -xfce4-autostart-editor \- XFce 4 Autostart Editor -.SH SYNOPSIS -.B xfce4-autostart-editor -.SH DESCRIPTION -.PP -Starts the XFce 4 Autostart Editor, which allows to edit the list of -autostarted applications. -.SH SEE ALSO -Upstream documentation in /usr/share/xfce4/doc/C/xfce4-session.html -.SH COPYRIGHT -Copyright \(co 2007 Emanuele Rocca -.br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - diff -Nru xfce4-session-4.8.2/debian/xfce4-session.lintian-overrides xfce4-session-4.8.3/debian/xfce4-session.lintian-overrides --- xfce4-session-4.8.2/debian/xfce4-session.lintian-overrides 2011-03-31 09:35:35.000000000 +0000 +++ xfce4-session-4.8.3/debian/xfce4-session.lintian-overrides 2012-02-12 16:59:45.000000000 +0000 @@ -1,2 +1,2 @@ -xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.0 usr/lib/libxfsm-4.6.so +xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/*/libxfsm-4.6.so.0.0.0 usr/lib/*/libxfsm-4.6.so xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0