[Pkg-xfce-commits] r7444 - in desktop/tags/xfce4-session: . 4.10.1-1 4.10.1-1/debian 4.10.1-1/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 09:41:20 UTC 2013
Author: corsac
Date: 2013-05-21 21:41:20 +0000 (Tue, 21 May 2013)
New Revision: 7444
Added:
desktop/tags/xfce4-session/4.10.1-1/
desktop/tags/xfce4-session/4.10.1-1/debian/
desktop/tags/xfce4-session/4.10.1-1/debian/changelog
desktop/tags/xfce4-session/4.10.1-1/debian/control
desktop/tags/xfce4-session/4.10.1-1/debian/manpages
desktop/tags/xfce4-session/4.10.1-1/debian/rules
desktop/tags/xfce4-session/4.10.1-1/debian/startxfce4.1
desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides
Removed:
desktop/tags/xfce4-session/4.10.1-1/debian/
desktop/tags/xfce4-session/4.10.1-1/debian/changelog
desktop/tags/xfce4-session/4.10.1-1/debian/control
desktop/tags/xfce4-session/4.10.1-1/debian/debian-tips
desktop/tags/xfce4-session/4.10.1-1/debian/manpages
desktop/tags/xfce4-session/4.10.1-1/debian/patches/02_fix-fortune-path.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/03_respect-save-settings-logout-plugin.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/04_fix-missing-lm.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/05_force-xfsettingsd-start.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
desktop/tags/xfce4-session/4.10.1-1/debian/patches/series
desktop/tags/xfce4-session/4.10.1-1/debian/rules
desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides
desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-tips.1
Log:
[svn-buildpackage] Tagging xfce4-session 4.10.1-1
Property changes on: desktop/tags/xfce4-session/4.10.1-1
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/xfce4-session:6602-7429
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/changelog 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,576 +0,0 @@
-xfce4-session (4.8.3-4) unstable; urgency=low
-
- * debian/patches:
- - 07-Store-the-watch-function-id-to-avoid-possible-double added, fix
- double free() with new glib. closes: #706425
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 17 May 2013 22:44:03 +0200
-
-xfce4-session (4.8.3-3) unstable; urgency=low
-
- * debian/patches:
- - 06-Handle-multiple-interactive-session-save-bug-5379 added, fix session
- not correctly saved in some corner cases. closes: #632404
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 08 Nov 2012 22:56:33 +0100
-
-xfce4-session (4.8.3-2) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * 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. Thanks Colin Watson for the patch.
- Closes: #659890
- * debian/patches: add missing DEP3 headers.
-
- [ Yves-Alexis Perez ]
- * debian/control:
- - update standards version to 3.9.3.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 03 Mar 2012 12:17:56 +0100
-
-xfce4-session (4.8.3-1) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * New upstream bugfix release.
- * debian/xfce4-autostart-editor.1, debian/manpages: dropped, the binary
- doesn't exist on Xfce 4.6 and later.
- * 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.
-
- [ Yves-Alexis Perez ]
- * debian/README
- - update text to more accurately describe the way to get ConsoleKit
- permissions. closes: #658284
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 13 Feb 2012 08:00:14 +0100
-
-xfce4-session (4.8.2-3) unstable; urgency=low
-
- * debian/prerm:
- - don't remove the x-session-manager alternative on upgrades.
- closes: #653834
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 02 Jan 2012 07:57:30 +0100
-
-xfce4-session (4.8.2-2) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * debian/patches:
- - 04_fix-missing-lm refreshed (cherry-pick the upstream one).
-
- [ Lionel Le Folgoc ]
- * debian/patches:
- - 03_respect-save-settings-logout-plugin.patch: added, let the logout panel
- plugin respect the '/general/SaveOnExit' xfconf key. closes: #651842
- - 04_fix-missing-lm.patch: fix to apply cleanly (configure.in.in doesn't
- exist).
- - series: updated.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 Dec 2011 15:51:07 +0100
-
-xfce4-session (4.8.2-1) unstable; urgency=low
-
- * New upstream release.
- * 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
- 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
- * debian/preinst:
- - handle /usr/share/doc/xfce4-session/html/el/images symlink beeing
- replaced by a real directory.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 14 Sep 2011 00:01:16 +0200
-
-xfce4-session (4.8.1-4) unstable; urgency=low
-
- * debian/README.Debian updated
- - mention LightDM.
- - fix path for xfsm-shutdown-helper. closes: #637197
- * debian/patches:
- - 04_fix-missing-lm added, fix FTBFS.
- * debian/control:
- - add build-dep on xfce4-dev-tools and libtool.
- * debian/rules:
- - run xdt-autogen before configure.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 04 Sep 2011 21:51:37 +0200
-
-xfce4-session (4.8.1-3) unstable; urgency=low
-
- * debian/patches:
- - 03_dont-die-on-dbus-disconnect added, fix crash when dbus is restarted.
- closes: #627888
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 27 May 2011 00:37:18 +0200
-
-xfce4-session (4.8.1-2) unstable; urgency=low
-
- * Upload to unstable.
- * debian/control:
- - drop Emanuele and Simon from Uploaders, thanks to them.
- - update standards version to 3.9.2.
- * debian/patches:
- - 05_force-xfsettingsd-start added, force xfsettingsd to start.
- * debian/postinst:
- - lower x-session-manager priority so startxfce4 takes precedence.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 16:39:47 +0200
-
-xfce4-session (4.8.1-1) experimental; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream 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.
- - drop fortunes-mod from depends, xfce4-session uses internal
- implementation. Move it to Suggests so people can still use it for real
- fortunes.
- - add a -dbg package with debugging symbols.
- * 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.
- - strip debugging symbols to the -dbg package.
- - ignore libxfsm-logout plugin in dh_makeshlibs, it's a plugin, not a
- library.
- * debian/xfce4-session.lintian-overrides:
- - drop xfsm-shutdown-helper and balou theme overrides, useless now.
- * debian/copyright updated for new upstream release.
-
- [ 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.
- * Re-enable building of the panel plugin:
- - debian/control: build-depends on xfce4-panel-dev >= 4.7.0
- - debian/rules: add it to chrpath and override dh_shlibdeps to move its
- deps as recommends.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 15 Feb 2011 00:18:12 +0100
-
-xfce4-session (4.6.2-2) unstable; urgency=low
-
- * 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/control
- - update standards version to 3.9.1.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Sep 2010 18:42:53 +0200
-
-xfce4-session (4.6.2-1) unstable; urgency=low
-
- [Stefan Ott]
- * debian/watch edited to track Xfce archive reorganisation.
-
- [Yves-Alexis Perez]
- * New upstream release:
- - fix wrong caption in german translation closes: #525499
- * debian/README.Debian:
- - add precisions about ConsoleKit/PolicyKit setup.
- * debian/control:
- - update standards version to 3.8.4.
- - drop build-dep on quilt.
- - add dep on ${misc:Depends}.
- - update debhelper build-dep for overrides.
- * Switch to 3.0 (quilt) source format.
- * debian/rules:
- - drop quilt rules.
- - switch to debhelper 7 tiny rules.
- - make intltool ignore c files in .pc quilt dir.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 13:55:01 +0200
-
-xfce4-session (4.6.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Apr 2009 18:13:45 +0200
-
-xfce4-session (4.6.0-2) unstable; urgency=low
-
- * Upload to unstable, and mark fixed bugs as such:
- - now display suspend/hibernate at session logout. closes: #490659
- * debian/control:
- - update standards version to 3.8.1.
- - update debhelper build-dep to 7.
- - move to xfce section.
- * debian/rules:
- - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS
- - replace dh_clean -k by dh_prep.
- * debian/compat bumped to 7.
- * add manpage for xfce4-session-settings.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 01:26:03 +0200
-
-xfce4-session (4.6.0-1) experimental; 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”.
-
- [ Xfce 4.6 ]
- * new upstream release.
- * debian/control:
- - update build-deps for 4.6.
- * debian/README.Debian: add precisions about choices in GDM.
- * debian/patches:
- - 02_fix-fortune-path added, fix fortune call path. closes: #497199
- * debian/xfce4-session.xml removed, will be shipped in desktop-base.
- * debian/rules: don't install xfce4-session.xml
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 13:01:12 +0100
-
-xfce4-session (4.4.2-6) unstable; urgency=low
-
- * debian/{postinst,prerm}: have them back, they manage the x-session-manager
- alternative. closes: #481933
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 May 2008 08:18:16 +0200
-
-xfce4-session (4.4.2-5) unstable; urgency=low
-
- * switch to triggers:
- - debian/{postinst,prerm} dropped.
- - 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.
- - remove Conflicts on desktop-base since Etch as a correct version.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 May 2008 19:45:02 +0200
-
-xfce4-session (4.4.2-4) unstable; urgency=low
-
- * debian/patches: 06_rephrase-tip added. closes: #399694
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 17 May 2008 15:36:15 +0200
-
-xfce4-session (4.4.2-3) unstable; urgency=low
-
- * debian/control: use dbus-x11 in Recommends: to make sure dbus users have a
- session bus running.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Apr 2008 17:49:34 +0200
-
-xfce4-session (4.4.2-2) unstable; urgency=low
-
- * debian/copyright: don't ship complete GFDL text.
- * debian/patches: 05_fix-resize-simple-splash-engine added, fix resize in
- simple engine config window. closes: #408445
- * debian/control:
- - updated standard versions to 3.7.3.
- - 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
- depend on it.
- - edit overrides for "binary-without-manpage", using complete path.
- * debian/copyright: use © sign.
-
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 28 Feb 2008 20:46:13 +0100
-
-xfce4-session (4.4.2-1) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- * debian/rules: don't ignore all make errors at clean stage.
-
- [ Simon Huggins ]
- * Fix shlibs for newer dpkg
- * Add Vcs-* headers to debian/control
-
- -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:19 +0000
-
-xfce4-session (4.4.1-2) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * debian/control: build against dbus to enable users to shutdown through hal.
- See README.Debian for more details. closes: #431886
- * debian/postinst: use posix kill -s to avoid problems on hurd.
-
- [ Simon Huggins ]
- * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
- * debian/patches/03*: Add patch to -session.1 manpage for typos
- closes: #351424
- * debian/patches/04*: Add patch to -session-logout.1 manpage for typos
- closes: #381398
- * debian/control: Move fake Homepage field to a real one now dpkg
- supports it.
-
- -- Simon Huggins <huggie at earth.li> Sat, 20 Oct 2007 12:47:13 +0100
-
-xfce4-session (4.4.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/copyright: update licenses & copyright holders.
-
- -- Yves-Alexis Perez <corsac at corsac.net> 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.
-
- (Emanuele Rocca)
- * xfce4-autostart-editor(1) and xfce4-tips(1) added.
- * Wrote a couple of Debian related tips in debian/debian-tips.
- Build-depend on fortune-mod to update tips.dat at build time.
- * libxfsm-4.2-0 is a private library, added lintian override for
- 'package-name-doesnt-match-sonames'.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 04 Feb 2007 13:15:38 +0100
-
-xfce4-session (4.3.99.2-3) unstable; urgency=low
-
- * Ship a xfce4-session.rc for failsafe session but use a default splash
- engine if none is configured. closes: #402708
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 18 Dec 2006 12:00:40 +0100
-
-xfce4-session (4.3.99.2-2) unstable; urgency=low
-
- * Remove useless build-dep on libhal-dev. What the hell was I thinking
- about that day ? Closes: #402021
-
- -- Yves-Alexis Perez <corsac at corsac.net> Thu, 7 Dec 2006 17:54:33 +0100
-
-xfce4-session (4.3.99.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
- * Added a patch to disable shadows in simple engine.
- * debian/rules: remove xfce4-session.rc from package so it uses by default
- files from desktop-base if present.
- * debian/control: conflicts against desktop-base << 0.3.20 because it needs
- a correct xfce4-session.rc no present before.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 27 Nov 2006 08:41:39 +0100
-
-xfce4-session (4.3.99.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
-
- -- Yves-Alexis Perez <corsac at corsac.net> 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.
- (Simon Huggins)
- * Add rpath fixes.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 10 Jul 2006 19:25:08 +0200
-
-xfce4-session (4.3.90.1-1) unstable; urgency=low
-
- (Yves-Alexis Perez)
- * New Upstream Release
- (Simon Huggins)
- * Remove all pointless .la files
- * Depend on fortune-mod for xfce4-tips
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 18:35:05 +0100
-
-xfce4-session (4.2.3-1) unstable; urgency=low
-
- * New Upstream Release
- * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 06 Nov 2005 22:01:12 +0100
-
-xfce4-session (4.2.2-1) unstable; urgency=low
-
- * SH: New Upstream Release
- * SH: Fix description closes: #300058
- * ER: Add lintian override: no-shlibs-control-file,
- postinst-must-call-ldconfig
- * SH: Add more lintian overrides - no point splitting out to a dev file and
- the binaries are private.
- * SH: Change suite to unstable
-
- -- Simon Huggins <huggie at earth.li> Sat, 18 Jun 2005 09:43:33 +0100
-
-xfce4-session (4.2.1-1) experimental; urgency=low
-
- * ML: New Upstream Release (Xfce 4.2.1)
- * ML: Upload to experimental to prevents problems with NEW packages
- * ML: debian/control: Added/fixed Maintainer/Uploaders fields
-
- -- Martin Loschwitz <madkiss at debian.org> Sat, 19 Mar 2005 13:02:00 +0100
-
-xfce4-session (4.2.0-2) experimental; urgency=low
-
- * Add --enable-final to configure
- * Add a Homepage: to the description
-
- -- Simon Huggins <huggie at earth.li> Sun, 16 Jan 2005 16:01:58 +0000
-
-xfce4-session (4.2.0-1) experimental; urgency=low
-
- * New upstream release
-
- -- Simon Huggins <huggie at earth.li> Sat, 15 Jan 2005 14:00:59 +0000
-
-xfce4-session (4.1.99.1-1) experimental; urgency=low
-
- * New upstream release (4.1.99.1 aka 4.2 RC1)
- * Build-Depend on xbase-clients for iceauth
-
- -- Simon Huggins <huggie at earth.li> Sat, 20 Nov 2004 19:00:44 +0000
-
-xfce4-session (0.1.3+20031213-5) unstable; urgency=low
-
- * Backport patch from CVS to allow --disable-tcp to work closes: #254812
- * Kludge in similar solution to upstream's CVS to always run
- ~/Desktop/Autostart even when there is no session closes: #254812
- * This implied a libtool update which makes the previous renaming of
- session_settings.so redundant
- * Update the manpage to the one in CVS now that we support those commandline
- options
- * Disable smproxy in the default.session so that new sessions don't start
- xfce4 twice closes: #261431
- * Add note in README.Debian about disabling smproxy and about not reporting
- bugs to upstream
- * Change upstreams manpage so it refers to the BTS not upstream
-
- -- Simon Huggins <huggie at earth.li> Wed, 04 Aug 2004 17:41:09 +0100
-
-xfce4-session (0.1.3+20031213-4) unstable; urgency=low
-
- * Take over this package with permission from Oliver - thanks to Oliver for
- his work on it.
- * Add Daniel Silverstone and Martin Loschwitz to Uploaders ready for when
- the xfce4 packages are group maintained.
- * Remove unneccessary session_settings.la
-
- -- Simon Huggins <huggie at earth.li> Sat, 10 Jul 2004 14:26:07 +0100
-
-xfce4-session (0.1.3+20031213-3) unstable; urgency=low
-
- * fix "logout window" not shown when using with GLib 2.4.x
- Thanks to Simon Huggins for digging up the patch
- (Closes: #252715, #253309)
- * manually rename session_settings to session_setting.so, somehow
- new builds don't name the file correctly
- (noticed by Michael Kebe and Simon Huggins)
- * remove explict Build-Depends on xlibs-dev and libgtk2.0-dev.
- These are now provided by libxfcegui4-dev >= 4.0.5. Bump required
- versions of various xfce4 libs to 4.0.5
- * Provide: x-session-manager and register as alternative for
- /usr/bin/x-session-manager (Closes: #187748, #203510, #234014, #252870)
- * bump up to Standards-Version: 3.6.1.0 (no changes)
-
- -- Oliver M. Bolzer <oliver at debian.org> Sat, 3 Jul 2004 11:58:00 +0200
-
-xfce4-session (0.1.3+20031213-2) unstable; urgency=low
-
- * include xinitrc.xfce4-session mentioned in the README (Closes: #228318)
-
- -- Oliver M. Bolzer <oliver at debian.org> Mon, 16 Feb 2004 09:37:27 +0100
-
-xfce4-session (0.1.3+20031213-1) unstable; urgency=low
-
- * Initial Upload to Archive. (Closes: #223536)
- * sync to upstream CVS, crash bug fixed that could leave inconstent session
- * man pages made now included upstream
-
- -- Oliver M. Bolzer <oliver at debian.org> Sat, 13 Dec 2003 14:03:18 +0100
-
-xfce4-session (0.1.3+20030922-1) unstable; urgency=low
-
- * Initial Package.
-
- -- Oliver M. Bolzer <oliver at debian.org> Tue, 9 Dec 2003 09:40:42 +0100
-
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/changelog (from rev 7433, desktop/trunk/xfce4-session/debian/changelog)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/changelog (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/changelog 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1,660 @@
+xfce4-session (4.10.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Upload to unstable.
+ * debian/rules:
+ - enable all hardening flags.
+ * debian/patches:
+ - drop all patches, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 21 May 2013 23:16:10 +0200
+
+xfce4-session (4.10.0-2) experimental; urgency=low
+
+ * debian/control:
+ - recommends xscreensaver. closes: 3683865
+ * debian/patches:
+ - 0001-Handle-multiple-interactive-session-save-bug-5379 added, fix broken
+ session in some cases. closes: #632404
+ * debian/xfce4-session.lintian-overrides updated, we do use hardening flags.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 13 Oct 2012 15:42:09 +0200
+
+xfce4-session (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 13:44:46 +0200
+
+xfce4-session (4.9.2-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 22 Apr 2012 14:31:11 +0200
+
+xfce4-session (4.9.1-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Apr 2012 16:00:33 +0200
+
+xfce4-session (4.9.0-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/patches:
+ - 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
+ ('--force' has been changed to '--replace').
+ - 06_no-settings-helper-in-490.patch: added, do not launch x-s-h.
+ - series: refreshed.
+ * debian/control:
+ - drop xfce4-dev-tools, libtool and xfce4-panel-dev from Build-Depends.
+ - bump xfce4-settings' dep to >= 4.9.0.
+ - drop xfce4-utils and ${shlibs:Recommends} from Recommends.
+ * debian/rules:
+ - clean up, no need to run xdt-autogen.
+ - tell dh_install to ignore .la files.
+ - drop overrides for shlibdeps and makeshlibs, the panel plugin isn't
+ built anymore.
+ * debian/xfce4-tips.1: dropped.
+ * debian/startxfce4.1: added, stolen from xfce4-utils.
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/control:
+ - bump build-deps for 4.9.
+ - update standards version to 3.9.3.
+ - drop fortunes-mod build-dep since xfce4-tip is gone.
+ - make xfce4-session break/replace xfce4-utils since it ships the xinitrc
+ script now.
+ - drop suggestions of fortunes-mode and sudo.
+ * debian/patches:
+ - 02_fix-fortune-path, 03_respect-save-settings-logout-plugin,
+ 04_fix-missing-lm, 05_force-xfsettingsd-start,
+ 06_no-settings-helper-in-490 dropped, not needed anymore.
+ * debian/rules:
+ - drop chrpath call.
+ - drop strfile call.
+ - fix permissions on xinitrc.
+ - build with --parallel.
+ * debian/debian-tips dropped, there's no tips anymore.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 22:05:11 +0200
+
+xfce4-session (4.8.3-4) unstable; urgency=low
+
+ * debian/patches:
+ - 07-Store-the-watch-function-id-to-avoid-possible-double added, fix
+ double free() with new glib. closes: #706425
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 17 May 2013 22:44:03 +0200
+
+xfce4-session (4.8.3-3) unstable; urgency=low
+
+ * debian/patches:
+ - 06-Handle-multiple-interactive-session-save-bug-5379 added, fix session
+ not correctly saved in some corner cases. closes: #632404
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 08 Nov 2012 22:56:33 +0100
+
+xfce4-session (4.8.3-2) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * 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. Thanks Colin Watson for the patch.
+ Closes: #659890
+ * debian/patches: add missing DEP3 headers.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - update standards version to 3.9.3.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 03 Mar 2012 12:17:56 +0100
+
+xfce4-session (4.8.3-1) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream bugfix release.
+ * debian/xfce4-autostart-editor.1, debian/manpages: dropped, the binary
+ doesn't exist on Xfce 4.6 and later.
+ * 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.
+
+ [ Yves-Alexis Perez ]
+ * debian/README
+ - update text to more accurately describe the way to get ConsoleKit
+ permissions. closes: #658284
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 13 Feb 2012 08:00:14 +0100
+
+xfce4-session (4.8.2-3) unstable; urgency=low
+
+ * debian/prerm:
+ - don't remove the x-session-manager alternative on upgrades.
+ closes: #653834
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 02 Jan 2012 07:57:30 +0100
+
+xfce4-session (4.8.2-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 04_fix-missing-lm refreshed (cherry-pick the upstream one).
+
+ [ Lionel Le Folgoc ]
+ * debian/patches:
+ - 03_respect-save-settings-logout-plugin.patch: added, let the logout panel
+ plugin respect the '/general/SaveOnExit' xfconf key. closes: #651842
+ - 04_fix-missing-lm.patch: fix to apply cleanly (configure.in.in doesn't
+ exist).
+ - series: updated.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 Dec 2011 15:51:07 +0100
+
+xfce4-session (4.8.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * 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
+ 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
+ * debian/preinst:
+ - handle /usr/share/doc/xfce4-session/html/el/images symlink beeing
+ replaced by a real directory.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 14 Sep 2011 00:01:16 +0200
+
+xfce4-session (4.8.1-4) unstable; urgency=low
+
+ * debian/README.Debian updated
+ - mention LightDM.
+ - fix path for xfsm-shutdown-helper. closes: #637197
+ * debian/patches:
+ - 04_fix-missing-lm added, fix FTBFS.
+ * debian/control:
+ - add build-dep on xfce4-dev-tools and libtool.
+ * debian/rules:
+ - run xdt-autogen before configure.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 04 Sep 2011 21:51:37 +0200
+
+xfce4-session (4.8.1-3) unstable; urgency=low
+
+ * debian/patches:
+ - 03_dont-die-on-dbus-disconnect added, fix crash when dbus is restarted.
+ closes: #627888
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 27 May 2011 00:37:18 +0200
+
+xfce4-session (4.8.1-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control:
+ - drop Emanuele and Simon from Uploaders, thanks to them.
+ - update standards version to 3.9.2.
+ * debian/patches:
+ - 05_force-xfsettingsd-start added, force xfsettingsd to start.
+ * debian/postinst:
+ - lower x-session-manager priority so startxfce4 takes precedence.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 16:39:47 +0200
+
+xfce4-session (4.8.1-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream 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.
+ - drop fortunes-mod from depends, xfce4-session uses internal
+ implementation. Move it to Suggests so people can still use it for real
+ fortunes.
+ - add a -dbg package with debugging symbols.
+ * 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.
+ - strip debugging symbols to the -dbg package.
+ - ignore libxfsm-logout plugin in dh_makeshlibs, it's a plugin, not a
+ library.
+ * debian/xfce4-session.lintian-overrides:
+ - drop xfsm-shutdown-helper and balou theme overrides, useless now.
+ * debian/copyright updated for new upstream release.
+
+ [ 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.
+ * Re-enable building of the panel plugin:
+ - debian/control: build-depends on xfce4-panel-dev >= 4.7.0
+ - debian/rules: add it to chrpath and override dh_shlibdeps to move its
+ deps as recommends.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 15 Feb 2011 00:18:12 +0100
+
+xfce4-session (4.6.2-2) unstable; urgency=low
+
+ * 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/control
+ - update standards version to 3.9.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Sep 2010 18:42:53 +0200
+
+xfce4-session (4.6.2-1) unstable; urgency=low
+
+ [Stefan Ott]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [Yves-Alexis Perez]
+ * New upstream release:
+ - fix wrong caption in german translation closes: #525499
+ * debian/README.Debian:
+ - add precisions about ConsoleKit/PolicyKit setup.
+ * debian/control:
+ - update standards version to 3.8.4.
+ - drop build-dep on quilt.
+ - add dep on ${misc:Depends}.
+ - update debhelper build-dep for overrides.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - drop quilt rules.
+ - switch to debhelper 7 tiny rules.
+ - make intltool ignore c files in .pc quilt dir.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 13:55:01 +0200
+
+xfce4-session (4.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Apr 2009 18:13:45 +0200
+
+xfce4-session (4.6.0-2) unstable; urgency=low
+
+ * Upload to unstable, and mark fixed bugs as such:
+ - now display suspend/hibernate at session logout. closes: #490659
+ * debian/control:
+ - update standards version to 3.8.1.
+ - update debhelper build-dep to 7.
+ - move to xfce section.
+ * debian/rules:
+ - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS
+ - replace dh_clean -k by dh_prep.
+ * debian/compat bumped to 7.
+ * add manpage for xfce4-session-settings.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 01:26:03 +0200
+
+xfce4-session (4.6.0-1) experimental; 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”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
+ * debian/README.Debian: add precisions about choices in GDM.
+ * debian/patches:
+ - 02_fix-fortune-path added, fix fortune call path. closes: #497199
+ * debian/xfce4-session.xml removed, will be shipped in desktop-base.
+ * debian/rules: don't install xfce4-session.xml
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 13:01:12 +0100
+
+xfce4-session (4.4.2-6) unstable; urgency=low
+
+ * debian/{postinst,prerm}: have them back, they manage the x-session-manager
+ alternative. closes: #481933
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 20 May 2008 08:18:16 +0200
+
+xfce4-session (4.4.2-5) unstable; urgency=low
+
+ * switch to triggers:
+ - debian/{postinst,prerm} dropped.
+ - 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.
+ - remove Conflicts on desktop-base since Etch as a correct version.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 May 2008 19:45:02 +0200
+
+xfce4-session (4.4.2-4) unstable; urgency=low
+
+ * debian/patches: 06_rephrase-tip added. closes: #399694
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 17 May 2008 15:36:15 +0200
+
+xfce4-session (4.4.2-3) unstable; urgency=low
+
+ * debian/control: use dbus-x11 in Recommends: to make sure dbus users have a
+ session bus running.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Apr 2008 17:49:34 +0200
+
+xfce4-session (4.4.2-2) unstable; urgency=low
+
+ * debian/copyright: don't ship complete GFDL text.
+ * debian/patches: 05_fix-resize-simple-splash-engine added, fix resize in
+ simple engine config window. closes: #408445
+ * debian/control:
+ - updated standard versions to 3.7.3.
+ - 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
+ depend on it.
+ - edit overrides for "binary-without-manpage", using complete path.
+ * debian/copyright: use © sign.
+
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 28 Feb 2008 20:46:13 +0100
+
+xfce4-session (4.4.2-1) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/rules: don't ignore all make errors at clean stage.
+
+ [ Simon Huggins ]
+ * Fix shlibs for newer dpkg
+ * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie at earth.li> Tue, 27 Nov 2007 16:39:19 +0000
+
+xfce4-session (4.4.1-2) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/control: build against dbus to enable users to shutdown through hal.
+ See README.Debian for more details. closes: #431886
+ * debian/postinst: use posix kill -s to avoid problems on hurd.
+
+ [ Simon Huggins ]
+ * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
+ * debian/patches/03*: Add patch to -session.1 manpage for typos
+ closes: #351424
+ * debian/patches/04*: Add patch to -session-logout.1 manpage for typos
+ closes: #381398
+ * debian/control: Move fake Homepage field to a real one now dpkg
+ supports it.
+
+ -- Simon Huggins <huggie at earth.li> Sat, 20 Oct 2007 12:47:13 +0100
+
+xfce4-session (4.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/copyright: update licenses & copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> 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.
+
+ (Emanuele Rocca)
+ * xfce4-autostart-editor(1) and xfce4-tips(1) added.
+ * Wrote a couple of Debian related tips in debian/debian-tips.
+ Build-depend on fortune-mod to update tips.dat at build time.
+ * libxfsm-4.2-0 is a private library, added lintian override for
+ 'package-name-doesnt-match-sonames'.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 04 Feb 2007 13:15:38 +0100
+
+xfce4-session (4.3.99.2-3) unstable; urgency=low
+
+ * Ship a xfce4-session.rc for failsafe session but use a default splash
+ engine if none is configured. closes: #402708
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 18 Dec 2006 12:00:40 +0100
+
+xfce4-session (4.3.99.2-2) unstable; urgency=low
+
+ * Remove useless build-dep on libhal-dev. What the hell was I thinking
+ about that day ? Closes: #402021
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Thu, 7 Dec 2006 17:54:33 +0100
+
+xfce4-session (4.3.99.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+ * Added a patch to disable shadows in simple engine.
+ * debian/rules: remove xfce4-session.rc from package so it uses by default
+ files from desktop-base if present.
+ * debian/control: conflicts against desktop-base << 0.3.20 because it needs
+ a correct xfce4-session.rc no present before.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 27 Nov 2006 08:41:39 +0100
+
+xfce4-session (4.3.99.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> 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.
+ (Simon Huggins)
+ * Add rpath fixes.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 10 Jul 2006 19:25:08 +0200
+
+xfce4-session (4.3.90.1-1) unstable; urgency=low
+
+ (Yves-Alexis Perez)
+ * New Upstream Release
+ (Simon Huggins)
+ * Remove all pointless .la files
+ * Depend on fortune-mod for xfce4-tips
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 18:35:05 +0100
+
+xfce4-session (4.2.3-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 06 Nov 2005 22:01:12 +0100
+
+xfce4-session (4.2.2-1) unstable; urgency=low
+
+ * SH: New Upstream Release
+ * SH: Fix description closes: #300058
+ * ER: Add lintian override: no-shlibs-control-file,
+ postinst-must-call-ldconfig
+ * SH: Add more lintian overrides - no point splitting out to a dev file and
+ the binaries are private.
+ * SH: Change suite to unstable
+
+ -- Simon Huggins <huggie at earth.li> Sat, 18 Jun 2005 09:43:33 +0100
+
+xfce4-session (4.2.1-1) experimental; urgency=low
+
+ * ML: New Upstream Release (Xfce 4.2.1)
+ * ML: Upload to experimental to prevents problems with NEW packages
+ * ML: debian/control: Added/fixed Maintainer/Uploaders fields
+
+ -- Martin Loschwitz <madkiss at debian.org> Sat, 19 Mar 2005 13:02:00 +0100
+
+xfce4-session (4.2.0-2) experimental; urgency=low
+
+ * Add --enable-final to configure
+ * Add a Homepage: to the description
+
+ -- Simon Huggins <huggie at earth.li> Sun, 16 Jan 2005 16:01:58 +0000
+
+xfce4-session (4.2.0-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Huggins <huggie at earth.li> Sat, 15 Jan 2005 14:00:59 +0000
+
+xfce4-session (4.1.99.1-1) experimental; urgency=low
+
+ * New upstream release (4.1.99.1 aka 4.2 RC1)
+ * Build-Depend on xbase-clients for iceauth
+
+ -- Simon Huggins <huggie at earth.li> Sat, 20 Nov 2004 19:00:44 +0000
+
+xfce4-session (0.1.3+20031213-5) unstable; urgency=low
+
+ * Backport patch from CVS to allow --disable-tcp to work closes: #254812
+ * Kludge in similar solution to upstream's CVS to always run
+ ~/Desktop/Autostart even when there is no session closes: #254812
+ * This implied a libtool update which makes the previous renaming of
+ session_settings.so redundant
+ * Update the manpage to the one in CVS now that we support those commandline
+ options
+ * Disable smproxy in the default.session so that new sessions don't start
+ xfce4 twice closes: #261431
+ * Add note in README.Debian about disabling smproxy and about not reporting
+ bugs to upstream
+ * Change upstreams manpage so it refers to the BTS not upstream
+
+ -- Simon Huggins <huggie at earth.li> Wed, 04 Aug 2004 17:41:09 +0100
+
+xfce4-session (0.1.3+20031213-4) unstable; urgency=low
+
+ * Take over this package with permission from Oliver - thanks to Oliver for
+ his work on it.
+ * Add Daniel Silverstone and Martin Loschwitz to Uploaders ready for when
+ the xfce4 packages are group maintained.
+ * Remove unneccessary session_settings.la
+
+ -- Simon Huggins <huggie at earth.li> Sat, 10 Jul 2004 14:26:07 +0100
+
+xfce4-session (0.1.3+20031213-3) unstable; urgency=low
+
+ * fix "logout window" not shown when using with GLib 2.4.x
+ Thanks to Simon Huggins for digging up the patch
+ (Closes: #252715, #253309)
+ * manually rename session_settings to session_setting.so, somehow
+ new builds don't name the file correctly
+ (noticed by Michael Kebe and Simon Huggins)
+ * remove explict Build-Depends on xlibs-dev and libgtk2.0-dev.
+ These are now provided by libxfcegui4-dev >= 4.0.5. Bump required
+ versions of various xfce4 libs to 4.0.5
+ * Provide: x-session-manager and register as alternative for
+ /usr/bin/x-session-manager (Closes: #187748, #203510, #234014, #252870)
+ * bump up to Standards-Version: 3.6.1.0 (no changes)
+
+ -- Oliver M. Bolzer <oliver at debian.org> Sat, 3 Jul 2004 11:58:00 +0200
+
+xfce4-session (0.1.3+20031213-2) unstable; urgency=low
+
+ * include xinitrc.xfce4-session mentioned in the README (Closes: #228318)
+
+ -- Oliver M. Bolzer <oliver at debian.org> Mon, 16 Feb 2004 09:37:27 +0100
+
+xfce4-session (0.1.3+20031213-1) unstable; urgency=low
+
+ * Initial Upload to Archive. (Closes: #223536)
+ * sync to upstream CVS, crash bug fixed that could leave inconstent session
+ * man pages made now included upstream
+
+ -- Oliver M. Bolzer <oliver at debian.org> Sat, 13 Dec 2003 14:03:18 +0100
+
+xfce4-session (0.1.3+20030922-1) unstable; urgency=low
+
+ * Initial Package.
+
+ -- Oliver M. Bolzer <oliver at debian.org> Tue, 9 Dec 2003 09:40:42 +0100
+
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/control 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,37 +0,0 @@
-Source: xfce4-session
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-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), dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool
-Standards-Version: 3.9.3
-Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
-
-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
-Suggests: sudo, fortunes-mod
-Provides: x-session-manager
-Description: Xfce4 Session Manager
- xfce4-session is an X11-compliant "session manager" designed for use with
- the Xfce4 Desktop Environment. On log out, the session manager saves the
- state of all your running applications. When you log back in, the session
- manager restores the same applications with the same window positions.
-
-Package: xfce4-session-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-session (= ${binary:Version})
-Description: Xfce4 Session Manager (debug symbols)
- This package ships debugging symbols for the Xfce session manager.
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/control (from rev 7430, desktop/trunk/xfce4-session/debian/control)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/control (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/control 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1,39 @@
+Source: xfce4-session
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl,
+ libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0),
+ libxfce4ui-1-dev (>= 4.10.0), libwnck-dev, x11-xserver-utils,
+ libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31),
+ dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.3
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
+
+Package: xfce4-session
+Section: xfce
+Architecture: any
+Breaks: xfce4-utils
+Replaces: xfce4-utils
+Pre-Depends: ${misc:Pre-Depends}, multiarch-support
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.10.0), xfconf
+Recommends: xfwm4, xfdesktop4, consolekit, upower, dbus-x11, x11-xserver-utils,
+ xscreensaver
+Suggests: sudo, fortunes-mod
+Provides: x-session-manager
+Description: Xfce4 Session Manager
+ xfce4-session is an X11-compliant "session manager" designed for use with
+ the Xfce4 Desktop Environment. On log out, the session manager saves the
+ state of all your running applications. When you log back in, the session
+ manager restores the same applications with the same window positions.
+
+Package: xfce4-session-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-session (= ${binary:Version})
+Description: Xfce4 Session Manager (debug symbols)
+ This package ships debugging symbols for the Xfce session manager.
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/debian-tips
===================================================================
--- desktop/trunk/xfce4-session/debian/debian-tips 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/debian-tips 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,8 +0,0 @@
-The Debian Xfce packages you're using right now are brought to you by the
-Debian Xfce Group.
-
-See http://pkg-xfce.alioth.debian.org for more information.
-%
-On Debian systems you can get a selection of panel plugins installing the
-xfce4-goodies package.
-%
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/manpages
===================================================================
--- desktop/trunk/xfce4-session/debian/manpages 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/manpages 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,2 +0,0 @@
-debian/xfce4-tips.1
-debian/xfce4-session-settings.1
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/manpages (from rev 7430, desktop/trunk/xfce4-session/debian/manpages)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/manpages (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/manpages 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1 @@
+debian/*.1
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/02_fix-fortune-path.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/02_fix-fortune-path.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-tips/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-tips/main.c 2011-09-13 18:17:10.000000000 +0200
-+++ xfce4-session-4.8.2/xfce4-tips/main.c 2011-09-13 23:21:51.882831214 +0200
-@@ -274,7 +274,7 @@
- channel = xfconf_channel_get ("xfce4-tips");
-
- /* test for fortune */
-- fortune_cmd = g_find_program_in_path ("fortune");
-+ fortune_cmd = g_find_program_in_path ("/usr/games/fortune");
-
- read_tips_from_file ();
-
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/03_respect-save-settings-logout-plugin.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/03_respect-save-settings-logout-plugin.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/03_respect-save-settings-logout-plugin.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,74 +0,0 @@
-From d7311f2dcedd96f5833acceb27f9d17275893e1e Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel at lefolgoc.net>
-Date: Thu, 25 Aug 2011 14:22:24 +0200
-Subject: Do not always save session with xfce4-logout-plugin (Bug #7915)
-
-Respect the value of the "/general/SaveOnExit" option from xfce4-session in the
-logout panel plugin as well.
-
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7915
----
- panel-plugin/Makefile.am | 2 ++
- panel-plugin/xfsm-logout-plugin.c | 14 +++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index 0675e2e..fd0609b 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -18,6 +18,7 @@ libxfsm_logout_plugin_la_SOURCES = \
- libxfsm_logout_plugin_la_CFLAGS = \
- $(LIBX11_CFLAGS) \
- $(LIBXFCE4PANEL_CFLAGS) \
-+ $(XFCONF_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(GTK_CFLAGS) \
-@@ -26,6 +27,7 @@ libxfsm_logout_plugin_la_CFLAGS = \
- libxfsm_logout_plugin_la_LIBADD = \
- $(LIBX11_LIBS) \
- $(LIBXFCE4PANEL_LIBS) \
-+ $(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
- $(GTK_LIBS) \
-diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
-index b8e25ab..12dec0f 100644
---- a/panel-plugin/xfsm-logout-plugin.c
-+++ b/panel-plugin/xfsm-logout-plugin.c
-@@ -43,6 +43,7 @@
-
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4ui/libxfce4ui.h>
-+#include <xfconf/xfconf.h>
- #include <libxfce4panel/libxfce4panel.h>
-
- #include "xfsm-logout-plugin-ui.h"
-@@ -207,12 +208,23 @@ static void
- xfsm_logout_plugin_show_confirmation_dialog(XfsmLogoutPlugin *logout_plugin,
- XfsmShutdownType type)
- {
-+ GError *error = NULL;
-+ XfconfChannel *channel;
- gint resp = GTK_RESPONSE_ACCEPT;
-
- g_return_if_fail(logout_plugin != NULL);
- g_return_if_fail(type >= XFSM_SHUTDOWN_LOGOUT && type <= XFSM_SHUTDOWN_HIBERNATE);
-
-- logout_plugin->allow_save = TRUE;
-+ if (G_UNLIKELY (!xfconf_init (&error))) {
-+ g_warning ("Unable to contact settings server: %s", error->message);
-+ g_error_free (error);
-+ logout_plugin->allow_save = TRUE;
-+ }
-+ else {
-+ channel = xfconf_channel_get ("xfce4-session");
-+ logout_plugin->allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
-+ xfconf_shutdown ();
-+ }
-
- if(type != XFSM_SHUTDOWN_SUSPEND && type != XFSM_SHUTDOWN_HIBERNATE) {
- GtkWidget *dialog, *topvbox, *hbox, *image, *label;
---
-1.7.2.5
-
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/04_fix-missing-lm.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/04_fix-missing-lm.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/04_fix-missing-lm.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,45 +0,0 @@
-commit eeaea26d3b777afb98c21317ad83170e3f725fd0
-Author: Brian J. Tarricone <brian at tarricone.org>
-Date: Mon Sep 26 01:18:48 2011 -0700
-
- explicitly link to libm where needed (bug #7953)
-
- we use rint() but aren't linking to libm; probably getting picked up
- implicitly by a dependency like libpng, which recently dropped that flag
- from its .pc file.
-
- Patch slightly updated for Debian to apply cleanly: changes to configure.in.in
- are made to configure.in instead.
-
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=7953
-Origin: backport, http://git.xfce.org/xfce/xfce4-session/commit/?id=eeaea26d3b777afb98c21317ad83170e3f725fd0
-
-diff --git a/configure.in b/configure.in
-index 141d427..8eff947 100644
---- a/configure.in
-+++ b/configure.in
-@@ -63,6 +63,10 @@ AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \
- AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \
- sigaction strdup sync vfork])
-
-+dnl Check for required libraries
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl Check for X11 installed
- XDT_CHECK_LIBX11_REQUIRE()
-
-diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
-index 96ae5c5..d049a35 100644
---- a/engines/balou/Makefile.am
-+++ b/engines/balou/Makefile.am
-@@ -31,7 +31,8 @@ libbalou_la_LDFLAGS = \
- libbalou_la_LIBADD = \
- $(top_builddir)/libxfsm/libxfsm-4.6.la \
- $(LIBXFCE4UI_LIBS) \
-- $(XFCONF_LIBS)
-+ $(XFCONF_LIBS) \
-+ $(LIBM)
-
-
- libbalou_la_DEPENDENCIES = \
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/05_force-xfsettingsd-start.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/05_force-xfsettingsd-start.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/05_force-xfsettingsd-start.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,13 +0,0 @@
-Index: xfce4-session-4.8.2/xfce4-session/main.c
-===================================================================
---- xfce4-session-4.8.2.orig/xfce4-session/main.c 2011-09-13 23:21:54.690846909 +0200
-+++ xfce4-session-4.8.2/xfce4-session/main.c 2011-09-13 23:21:58.626868935 +0200
-@@ -144,7 +144,7 @@
- sm_init (channel, disable_tcp, manager);
-
- /* start xfsettingsd */
-- if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
-+ if ( !g_spawn_command_line_async ("xfsettingsd --force", NULL))
- {
- g_warning ("Could not start xfsettingsd");
- }
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,151 +0,0 @@
-From cec1b90a752794091032994865e79062d6ce3e6f Mon Sep 17 00:00:00 2001
-From: Dimitar Zhekov <hamster at mbox.contact.bg>
-Date: Thu, 8 Nov 2012 18:04:47 +0100
-Subject: [PATCH] Handle multiple interactive session save (bug #5379).
-
-Additionnaly, we now use SmSaveGlobal on log out / shutdown without
-session save which avoids data loss. Previously clients would not save
-anything on log out without session save.
-
-Based on original work by Chris Bainbridge (chris.bainbridge at gmail.com).
----
- xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++------------------
- 1 file changed, 47 insertions(+), 34 deletions(-)
-
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index 3078d6a..92ae8e3 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -96,6 +96,7 @@ struct _XfsmManager
-
- XfsmManagerState state;
- XfsmShutdownType shutdown_type;
-+ gboolean save_session;
-
- gboolean session_chooser;
- gchar *session_name;
-@@ -225,6 +226,7 @@ xfsm_manager_init (XfsmManager *manager)
- manager->session_chooser = FALSE;
- manager->failsafe_mode = TRUE;
- manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
-+ manager->save_session = TRUE;
-
- manager->pending_properties = g_queue_new ();
- manager->starting_properties = g_queue_new ();
-@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *manager,
- XfsmClient *cl = lp->data;
- if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
- {
-- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
-+ /* a client is already interacting, so new client has to wait */
-+ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
-+ xfsm_manager_cancel_client_save_timeout(manager, client);
- return;
- }
- }
-@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager,
- }
- #endif
-
-- if (!shutdown || shutdown_save)
-+ /* don't save the session if shutting down without save */
-+ manager->save_session = !shutdown || shutdown_save;
-+
-+ if (save_type == SmSaveBoth && !manager->save_session)
- {
-- xfsm_manager_set_state (manager,
-- shutdown
-- ? XFSM_MANAGER_SHUTDOWN
-- : XFSM_MANAGER_CHECKPOINT);
-+ /* saving the session, so clients should
-+ * (prompt to) save the user data only */
-+ save_type = SmSaveGlobal;
-+ }
-
-- /* handle legacy applications first! */
-+ xfsm_manager_set_state (manager,
-+ shutdown
-+ ? XFSM_MANAGER_SHUTDOWN
-+ : XFSM_MANAGER_CHECKPOINT);
-+
-+ /* handle legacy applications first! */
-+ if (manager->save_session)
- xfsm_legacy_perform_session_save ();
-
-- for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
-- lp;
-- lp = lp->next)
-- {
-- XfsmClient *client = lp->data;
-- XfsmProperties *properties = xfsm_client_get_properties (client);
-- const gchar *program;
--
-- /* xterm's session management is broken, so we won't
-- * send a SAVE YOURSELF to xterms */
-- program = xfsm_properties_get_string (properties, SmProgram);
-- if (program != NULL && strcasecmp (program, "xterm") == 0)
-- continue;
-+ for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
-+ lp;
-+ lp = lp->next)
-+ {
-+ XfsmClient *client = lp->data;
-+ XfsmProperties *properties = xfsm_client_get_properties (client);
-+ const gchar *program;
-
-- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-- {
-- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
-- interact_style, fast);
-- }
-+ /* xterm's session management is broken, so we won't
-+ * send a SAVE YOURSELF to xterms */
-+ program = xfsm_properties_get_string (properties, SmProgram);
-+ if (program != NULL && strcasecmp (program, "xterm") == 0)
-+ continue;
-
-- xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-- xfsm_manager_start_client_save_timeout (manager, client);
-+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+ {
-+ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
-+ interact_style, fast);
- }
-- }
-- else
-- {
-- /* shutdown session without saving */
-- xfsm_manager_perform_shutdown (manager);
-+
-+ xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-+ xfsm_manager_start_client_save_timeout (manager, client);
- }
- }
-
-@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
- XfsmClient *client,
- gboolean success)
- {
-- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-+ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in
-+ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone
-+ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */
-+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING &&
-+ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL &&
-+ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT)
- {
- xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being "
- "in save mode. Prepare to be nuked!\n",
-@@ -1539,7 +1551,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager)
- xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n");
-
- /* all clients done, store session data */
-- xfsm_manager_store_session (manager);
-+ if (manager->save_session)
-+ xfsm_manager_store_session (manager);
-
- if (manager->state == XFSM_MANAGER_CHECKPOINT)
- {
---
-1.7.10.4
-
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,26 +0,0 @@
-From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Fri, 26 Apr 2013 20:05:10 +0200
-Subject: [PATCH] Store the watch function id to avoid possible double free
- (bug #9709).
-
----
- xfce4-session/xfsm-startup.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/xfce4-session/xfsm-startup.c
-+++ b/xfce4-session/xfsm-startup.c
-@@ -567,9 +567,10 @@ xfsm_startup_start_properties (XfsmPrope
- child_watch_data = g_new (XfsmStartupData, 1);
- child_watch_data->manager = g_object_ref (manager);
- child_watch_data->properties = properties;
-- g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
-- xfsm_startup_child_watch, child_watch_data,
-- (GDestroyNotify) xfsm_startup_data_free);
-+ child_watch_data->properties->child_watch_id =
-+ g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
-+ xfsm_startup_child_watch, child_watch_data,
-+ (GDestroyNotify) xfsm_startup_data_free);
-
- /* set a timeout -- client must register in a a certain amount of time
- * or it's assumed to be broken/have issues. */
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/patches/series 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,6 +0,0 @@
-02_fix-fortune-path.patch
-03_respect-save-settings-logout-plugin.patch
-04_fix-missing-lm.patch
-05_force-xfsettingsd-start.patch
-06-Handle-multiple-interactive-session-save-bug-5379.patch
-07-Store-the-watch-function-id-to-avoid-possible-double.patch
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/rules 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,42 +0,0 @@
-#!/usr/bin/make -f
-
-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
- find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
-
-override_dh_auto_clean:
- rm -f po/POTFILES.skip
- dh_auto_clean
-
-override_dh_install:
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.*a
-
- chrpath -d -k debian/tmp/usr/bin/* \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/xfsm-shutdown-helper \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*so \
- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/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 \
- debian/tmp/usr/share/xfce4/tips/tips.dat
- rm -f debian/tmp/etc/xdg/autostart/xfce4-tips-autostart.desktop
- dh_install --fail-missing
-
-override_dh_shlibdeps:
- dh_shlibdeps -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
- -dRecommends debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
-
-override_dh_makeshlibs:
- dh_makeshlibs -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so
-
-override_dh_strip:
- dh_strip --dbg-package=xfce4-session-dbg
-
-%:
- dh $@
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/rules (from rev 7431, desktop/trunk/xfce4-session/debian/rules)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/rules (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/rules 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+override_dh_install:
+ chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc
+ dh_install --fail-missing -X .la
+
+override_dh_strip:
+ dh_strip --dbg-package=xfce4-session-dbg
+
+%:
+ dh $@ --parallel
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/startxfce4.1 (from rev 7430, desktop/trunk/xfce4-session/debian/startxfce4.1)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/startxfce4.1 (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/startxfce4.1 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1,41 @@
+.\" Copyright (c) 2005 Emanuele Rocca
+.TH STARTXFCE4 "1" "June 2005" "startxfce4" "User Commands"
+.SH NAME
+startxfce4 \- initialize an Xfce session
+.SH SYNOPSIS
+.B startxfce4
+.SH DESCRIPTION
+.PP
+.B startxfce4
+is a script responsible for starting an Xfce session. It runs
+.B xinit
+passing the file specified in the
+.B FILES
+subsection as an argument.
+.P
+You may want to modify the default
+.B xinitrc
+file. In order to do that, copy
+.I /etc/xdg/xfce4/xinitrc
+to
+.I ~/.config/xfce4/xinitrc
+and modify that file.
+.SH FILES
+.PP
+.IP ~/.config/xfce4/xinitrc
+User configuration file
+.IP /etc/xdg/xfce4/xinitrc
+System wide configuration file
+.SH SEE ALSO
+.PP
+.BR xfce4-session (1),
+.BR xinit (1),
+.BR dbus-launch (1),
+.BR ssh-agent (1),
+.BR file:///usr/share/xfce4/doc/C/xfce4-use.html#xfce4-getting-started
+.SH COPYRIGHT
+Copyright \(co 2005 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.
+
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,2 +0,0 @@
-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
Copied: desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides (from rev 7430, desktop/trunk/xfce4-session/debian/xfce4-session.lintian-overrides)
===================================================================
--- desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides (rev 0)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-session.lintian-overrides 2013-05-21 21:41:20 UTC (rev 7444)
@@ -0,0 +1,11 @@
+# the lib is private so we won't split it
+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
+
+# we do build using hardening flags, it's a false positive
+xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/splash-engines/libbalou.so
+xfce4-session: hardening-no-fortify-functions usr/lib/*/xfce4/session/xfsm-shutdown-helper
+
+# XFCE is a valid category, desktop-file-validate has to be updated (#671600)
+xfce4-session: desktop-entry-invalid-category XFCE usr/share/applications/xfce-session-settings.desktop
+
Deleted: desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-tips.1
===================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-tips.1 2013-05-21 20:52:48 UTC (rev 7429)
+++ desktop/tags/xfce4-session/4.10.1-1/debian/xfce4-tips.1 2013-05-21 21:41:20 UTC (rev 7444)
@@ -1,21 +0,0 @@
-.\" Copyright (C) 2007 Emanuele Rocca
-.TH XFCE4-TIPS "1" "January 2007" "xfce4-tips" "User Commands"
-.SH NAME
-xfce4-tips \- XFce 4 Tips
-.SH SYNOPSIS
-.B xfce4-tips
-.SH DESCRIPTION
-.PP
-This command displays some usage tips about XFce.
-.SH FILES
-.TP
-.I /usr/share/xfce4/tips/tips
-List of tips.
-.SH SEE ALSO
-Upstream documentation in /usr/share/xfce4/doc/C/index.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.
-
More information about the Pkg-xfce-commits
mailing list