[Pkg-xfce-commits] r6115 - in desktop/tags/xfwm4: . 4.8.2-1/debian 4.8.2-1/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Oct 11 12:33:42 UTC 2011
Author: corsac
Date: 2011-10-11 12:33:41 +0000 (Tue, 11 Oct 2011)
New Revision: 6115
Added:
desktop/tags/xfwm4/4.8.2-1/
desktop/tags/xfwm4/4.8.2-1/debian/changelog
desktop/tags/xfwm4/4.8.2-1/debian/compat
desktop/tags/xfwm4/4.8.2-1/debian/control
desktop/tags/xfwm4/4.8.2-1/debian/patches/0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch
desktop/tags/xfwm4/4.8.2-1/debian/patches/series
desktop/tags/xfwm4/4.8.2-1/debian/rules
Removed:
desktop/tags/xfwm4/4.8.2-1/debian/changelog
desktop/tags/xfwm4/4.8.2-1/debian/compat
desktop/tags/xfwm4/4.8.2-1/debian/control
desktop/tags/xfwm4/4.8.2-1/debian/rules
Log:
[svn-buildpackage] Tagging xfwm4 4.8.2-1
Deleted: desktop/tags/xfwm4/4.8.2-1/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog 2011-10-07 18:12:15 UTC (rev 6103)
+++ desktop/tags/xfwm4/4.8.2-1/debian/changelog 2011-10-11 12:33:41 UTC (rev 6115)
@@ -1,482 +0,0 @@
-xfwm4 (4.8.2-1) UNRELEASED; urgency=low
-
- * New upstream release, including:
- - Updated Dutch translation. lp: #781061
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Thu, 22 Sep 2011 21:34:26 +0200
-
-xfwm4 (4.8.1-4) unstable; urgency=low
-
- * debian/*.1:
- - update manpages
- * debian/xfwm4.1:
- - pick manpage from help2man, provide all xfwm4 options. closes: #632714
- - correct the doc path in the "See Also" section. closes: #632709
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 04 Sep 2011 22:12:56 +0200
-
-xfwm4 (4.8.1-3) unstable; urgency=low
-
- * Upload to unstable.
- * debian/control:
- - drop Emanuele, Simon and Michael from uploaders, thanks to them.
- - update standards version to 3.9.2.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 16:45:48 +0200
-
-xfwm4 (4.8.1-2) experimental; urgency=low
-
- * debian/control:
- - update xfconf build-dep to 4.8.
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 07 Mar 2011 08:03:27 +0100
-
-xfwm4 (4.8.1-1) experimental; urgency=low
-
- [ Lionel Le Folgoc ]
- * New upstream bugfix release.
- * debian/control: add myself to Uploaders.
- * debian/rules: stop overridding libexecdir; no need to pass
- --enable-compositor, it's already the default nowadays.
-
- [ Yves-Alexis Perez ]
- * New upstream development release.
- * debian/control:
- - update standards version to 3.9.1.
- - refresh build-deps for Xfce 4.7.
- - build-conflicts against libxfcegui4-dev to be sure to pick kbd headers
- from libxfce4ui-dev.
- - add build-dep on hardening-includes.
- * debian/rules:
- - pick {C,LD}FLAGS from dpkg-buildflags.
- - add hardening flags to {C,LD}FLAGS.
- - drop useless chrpath call.
- * add an xfwm4-dbg package.
- * debian/copyright updated for new release.
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 14 Feb 2011 23:25:11 +0100
-
-xfwm4 (4.6.2-1) unstable; urgency=low
-
- [ Stefan Ott ]
- * debian/watch edited to track Xfce archive reorganisation.
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- * debian/control
- - update standards version to 3.8.4.
- - add depends on ${misc:Depends}.
- - debhelper build-dep bumped for overrides support.
- * Switch to 3.0 (quilt) source format.
- * debian/rules:
- - switch to tiny debhelper 7 rules.
- * debian/docs: use dh_installdocs to install docs.
- * debian/manpages: use dh_installman to install manpages.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 22 May 2010 19:04:10 +0200
-
-xfwm4 (4.6.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Apr 2009 18:30:15 +0200
-
-xfwm4 (4.6.0-2) unstable; urgency=low
-
- * Upload to unstable, and mark fixed bugs as such:
- - warn user about shortcut conflicts. closes: #370482
- - allow user to disable blinking windows (in accessibility) closes: #500949
- - keyboard shortcut themes don't exist in 4.6 anymore, this closes: #434480
- - mouse position after wrap follows the wrap distance. closes: #380480
- * debian/rules:
- - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
- - install manpages using dh_installman.
- * debian/compat bumped to 7.
- * debian/control:
- - update standards version to 3.8.1.
- - move to xfce section.
- * add manpages for all binaries.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 01:35:58 +0200
-
-xfwm4 (4.6.0-1) experimental; urgency=low
-
- [ Yves-Alexis Perez ]
- [ Xfce 4.6 Alpha “Pinkie”]
- * new upstream alpha release.
- * debian/control:
- - update standards version to 3.8.0.
- - update build dep for Xfce 4.6 Alpha release.
- - remove build dep on quilt.
- - add build dep on intltool.
- * debian/patches:
- - 01_filter-grab-ungrab-events dropped, merged upstream.
- - 02_exit-on-selectionclear too.
- - 03_fix-compositing-overlay as well.
- - 04_fix-automaximize-on-move ...
- - 05_awn-focus.patch finally.
- * debian/rules, debian/lintian:
- - remove all references to mcs.
- - remove references to quilt.
- - stop messing with config.{guess,sub}.
-
- [ Xfce 4.6 Beta 1 “Fuzzy”]
- * new upstream beta release.
- * debian/control:
- - update build-deps for Fuzzy.
-
- [ Xfce 4.6 Beta 2 “Hopper”]
- * new upstream beta release.
- * debian/control:
- - update build-deps for Hopper.
- * debian/patches:
- - 01_fix-maximize-bug, fix maximization bug. closes: #508352
-
- [ Xfce 4.6 Beta 3 “Tuco-tuco”]
- * new upstream beta release.
- * debian/control:
- - update build-deps for “Tuco-Tuco”.
- * debian/rules:
- - replace dh_clean -k by dh_prep.
- - install NEWS file.
-
- [ Xfce 4.6 RC1 “Capybara” ]
- * new upstream release candidate.
- * debian/control:
- - update build-deps for “Capybara”.
-
- [ Xfce 4.6 ]
- * new upstream release.
- - fix various compositing issues. closes: #483070
- - fix support for win_gravity wm hint. closes: #448443
- - fix iconification with skip_taskbar. closes: #491817
- * debian/control:
- - update build-deps for 4.6.
- - bump build-dep on debhelper for dh_prep.
- - drop build-dep on quilt, now useless.
- * debian/copyright:
- - update dates, copyrights and licensing informations.
- * debian/patches:
- - 01_fix-maximize-bug dropped, merged upstream.
- * debian/rules:
- - remove calls to quilt patch rules
-
- [ Michael Casadevall ]
- [ Xfce 4.6 Beta 1 "Fuzzy" ]
- * debian/rules:
- - Added --libexecdir=\$${prefix}/lib to compily with Debian policy
- * debian/control:
- - Added myself to uploaders
-
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 13:41:49 +0100
-
-xfwm4 (4.4.2-5) unstable; urgency=low
-
- * switch to triggers:
- - debian/{postinst,prerm}: remove xfce-mcs-manager refresh.
- - debian/control: version the Recommends: on xfce4-mcs-manager.
- * debian/control:
- - remove Martin Loschwitz from Uploaders.
- - drop Conflicts/Replaces against old xfwm4-themes not in Etch.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 May 2008 19:58:55 +0200
-
-xfwm4 (4.4.2-4) unstable; urgency=low
-
- * debian/patches:
- - 01_filter-grab-ungrab-events added, prevents redrawing the frame twice.
- (Xfce r26363).
- - 02_exit-on-selectionclear added, improve “--replace” protocol.
- (Xfce #2374 and r26585).
- - 03_compositing-overlay added, fix compositing with overlay
- windows (video players and screensavers).
- Xfce #3849, taken from r26691. closes: #476396
- - 04_fix-automaximize-on-move added. (Xfce r26966)
- - 01_awn-focus moved to 05_awn-focus.
- * debian/copyright: update dates.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 17 May 2008 16:58:28 +0200
-
-xfwm4 (4.4.2-3) unstable; urgency=low
-
- * debian/patches: 01_awn-focus added, fix focus problems with
- avant-window-navigator in some cases. Xfce #3439. closes: #463647
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 28 Mar 2008 23:52:59 +0100
-
-xfwm4 (4.4.2-2) unstable; urgency=low
-
- * debian/watch: narrow regexp so we don't match xfwm4-themes. Thanks
- Antonio Terceiro. closes: #462462
- * debian/control:
- - updated my email address.
- - updated standards version to 3.7.3 (no changes needed).
- * debian/copyright: use © sign.
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 02 Mar 2008 01:18:01 +0100
-
-xfwm4 (4.4.2-1) unstable; urgency=low
-
- [ Simon Huggins ]
- * Use kill -s to keep Hurd and lintian happy at the same time.
- * debian/control: Move fake Homepage field to a real one now dpkg
- supports it.
- * Add Vcs-* headers to debian/control
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- * debian/patches:
- - 01_xfwm4-fix-transient-windows.patch removed, included upstream.
- - 02_fix-xfwm4-hang.patch removed, included upstream.
- * debian/rules: fix parallel builds.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 02 Dec 2007 11:33:02 +0100
-
-xfwm4 (4.4.1-3) unstable; urgency=high
-
- * debian/xfwm4.1: update bugs reporting in manpage.
- * debian/xfwm4.menu: switch to new menu policy.
- * debian/postinst: use posix kill -s to avoid problems on hurd.
- * debian/rules: enable output of distclean target.
- * debian/lintian: ignore safe lintian warnings.
- * debian/patches/02_fix-xfwm-hang.patch added to fix deadlock with gtk 2.12
- urgency=high because gtk 2.12 entered archive so we need to reach testing
- before it does.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Fri, 21 Sep 2007 08:43:40 +0200
-
-xfwm4 (4.4.1-2) unstable; urgency=low
-
- * debian/patches: 01_xfwm4-fix-transient-windows.patch added to correct
- behavior with transient windows. closes: #367616
- * switch from dpatch to quilt.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Tue, 26 Jun 2007 23:41:22 +0200
-
-xfwm4 (4.4.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: added versionned build-dep against gtk 2.10.
- * debian/copyright: update copyright holders.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
-
-xfwm4 (4.4.0-1) experimental; urgency=low
-
- (Yves-Alexis Perez)
- * New upstream release. closes: #390462, #379442, #380639
- * debian/control:
- - updated build-deps against Xfce 4.4.
- - recommends librsvg2-common so svg icons are preferred over png ones.
-
- (Emanuele Rocca)
- * debian/rules: s/theme=microdeck2/theme=curve/ removed to keep upstream's
- /usr/share/xfwm4/defaults
-
- -- Yves-Alexis Perez <corsac at corsac.net> Mon, 29 Jan 2007 12:08:33 +0100
-
-xfwm4 (4.3.99.2-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
-
- -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 16:37:06 +0100
-
-xfwm4 (4.3.99.1-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
- * Cycle windows keybinding is back. Closes: #370310
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 13:43:51 +0100
-
-xfwm4 (4.3.90.2-2) unstable; urgency=low
-
- * Add upstream patch to fix mouse focus grab.
- See http://bugzilla.xfce.org/show_bug.cgi?id=2022
-
- -- Yves-Alexis Perez <corsac at corsac.net> Tue, 25 Jul 2006 09:59:09 +0200
-
-xfwm4 (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:26:50 +0200
-
-xfwm4 (4.3.90.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 18:35:05 +0100
-
-xfwm4 (4.2.3.2-2) unstable; urgency=low
-
- * Add patch to fix moving windows to other workspaces closes: #341058
-
- -- Simon Huggins <huggie at earth.li> Thu, 05 Jan 2006 00:41:18 +0000
-
-xfwm4 (4.2.3.2-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
-
-xfwm4 (4.2.2-1) unstable; urgency=low
-
- * New Upstream Release
- * Remove Build-Depends on libstartup-notification0-dev as this should be
- satisfied via libxfce4gui-dev now
- * Change suite to unstable
-
- -- Simon Huggins <huggie at earth.li> Sat, 18 Jun 2005 09:45:36 +0100
-
-xfwm4 (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
-
-xfwm4 (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 17:01:33 +0000
-
-xfwm4 (4.2.0-1) experimental; urgency=low
-
- * New Upstream Release
-
- -- Simon Huggins <huggie at earth.li> Sat, 15 Jan 2005 13:41:19 +0000
-
-xfwm4 (4.1.99.1-1) experimental; urgency=low
-
- * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1)
- * ML: rules: example.xfwm4rc is gone, don't try to install it
-
- -- Martin Loschwitz <madkiss at debian.org> Fri, 19 Nov 2004 17:23:00 +0100
-
-xfwm4 (4.0.6-1) unstable; urgency=low
-
- * New upstream release
- * Remove Norbert Tretkowski as requested
- * Improve description
- * Suggests: xfce4
-
- -- Simon Huggins <huggie at earth.li> Sat, 24 Jul 2004 18:29:50 +0100
-
-xfwm4 (4.0.5-1) unstable; urgency=low
-
- * New upstream release
- * Update upstream's libtool
- * Correct path in manpage
- * Add recommends on xfce4-mcs-manager the settings manager
- * Add depends on libstartup-notification0
-
- -- Simon Huggins <huggie at earth.li> Sun, 02 May 2004 19:12:09 +0100
-
-xfwm4 (4.0.3.1-2) unstable; urgency=low
-
- * Update libtool
- * Just adding Daniel wasn't enough. Add self to Uploaders so katie doesn't
- think this is an NMU again.
-
- -- Simon Huggins <huggie at earth.li> Tue, 09 Mar 2004 13:56:19 +0000
-
-xfwm4 (4.0.3.1-1) unstable; urgency=low
-
- * New upstream release
- * Add Daniel Silverstone <dsilvers at debian.org> to Uploaders as approved by
- madkiss
- * Add a manpage for xfwm4 referring to the packaged docs
- closes: #226032, #188734
- * Remove .la and .a files from mcs-plugins dir
- * Quote needs in menu for lintian
- * Thanks to Daniel for checking and uploading these packages
-
- -- Simon Huggins <huggie at earth.li> Wed, 25 Feb 2004 12:11:05 +0000
-
-xfwm4 (4.0.2-2) unstable; urgency=low
-
- * Fixed Recommends/Replaces stuff in debian/control
-
- -- Martin Loschwitz <madkiss at debian.org> Sat, 27 Dec 2003 12:25:00 +0100
-
-xfwm4 (4.0.2-1) unstable; urgency=low
-
- * Acknowledging NMU (Closes:#211804)
- * New Upstream release
-
- -- Martin Loschwitz <madkiss at debian.org> Fri, 26 Dec 2003 16:17:00 +0100
-
-xfwm4 (4.0.0.final-1.1) unstable; urgency=low
-
- * NMU
- * remove --slave part from "update-alternatives --remove" in prerm
- (Closes:#211804)
-
- -- Guido Guenther <agx at debian.org> Thu, 20 Nov 2003 12:14:48 +0100
-
-xfwm4 (4.0.0.final-1) unstable; urgency=low
-
- * New Upstream release.
- * New Co-Maintainer: Norbert Tretkowski.
- * Various cleanups in debian/ subdirectory.
- * Deleted xfwm4-themes, has its own source package now.
- * Bumped Standards-Version to 3.6.1 (no changes).
-
- -- Martin Loschwitz <madkiss at debian.org> Tue, 29 Sep 2003 16:58:00 +0200
-
-xfwm4 (4.0.0+cvs.20030421-1) unstable; urgency=low
-
- * New CVS checkout (2003-04-21)
-
- -- Martin Loschwitz <madkiss at debian.org> Mon, 21 Apr 2003 19:33:00 +0100
-
-xfwm4 (4.0.0+cvs.20030301-1) unstable; urgency=low
-
- * New CVS checkout (Using Xfce CVS, 2003-03-01)
- * Official release (really this time!) (last release was never made public)
- * debian/control: Changed Maintainer e-mail address
-
- -- Martin Loschwitz <madkiss at debian.org> Sat, 01 Mar 2003 14:09:00 +0100
-
-xfwm4 (4.0.0+cvs.20030216-1) unstable; urgency=low
-
- * New CVS checkout (Using Xfce CVS, 2003-02-16)
- * Official release (last release was never made public)
-
- -- Martin Loschwitz <madkiss at madkiss.org> Sun, 16 Feb 2003 12:57:00 +0100
-
-xfwm4 (4.0.0+cvs.20030119-1) unstable; urgency=low
-
- * New CVS checkout (Using Xfce4 cvs, 2003-01-19)
- * debian/control: Use Xft2
- * debian/control: Build depend on libxfce4-mcs
- * debian/control: Suggest xfce-mce-manager
-
- -- Martin Loschwitz <madkiss at madkiss.org> Sun, 19 Jan 2003 14:52:00 +0100
-
-xfwm4 (4.0.0+cvs.20021222-1) unstable; urgency=low
-
- * New CVS checkout (Using Xfce4 cvs, 2002-12-22)
- * debian/rules: Install example configuration file into doc-dir
- * debian/control: Changed some Recommends: to Suggests:
- * debian/xfwm4-themes.install: Added new theme koynacity
-
- -- Martin Loschwitz <madkiss at madkiss.org> Sun, 22 Dec 2002 14:09:00 +0100
-
-xfwm4 (4.0.0+cvs.20021127-1) unstable; urgency=low
-
- * Initial Release. (Closes: #166641)
-
- -- Martin Loschwitz <madkiss at madkiss.org> Wed, 27 Nov 2002 15:14:00 +0100
Copied: desktop/tags/xfwm4/4.8.2-1/debian/changelog (from rev 6114, desktop/trunk/xfwm4/debian/changelog)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/changelog (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/changelog 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1,494 @@
+xfwm4 (4.8.2-1) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream release, including:
+ - Updated Dutch translation. lp: #781061
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 0001-Do-not-enforce-the-size-increment-only-if-the-size-r added,
+ cherry-picked from upstream.
+ * debian/rules:
+ - use dpkg-dev hardening support
+ * debian/control:
+ - update dpkg-dev and debhelper build-dep for hardening support
+ - drop build-dep on hardening-includes.
+ * debian/compat bumped to 9 for hardening support.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 11 Oct 2011 14:14:04 +0200
+
+xfwm4 (4.8.1-4) unstable; urgency=low
+
+ * debian/*.1:
+ - update manpages
+ * debian/xfwm4.1:
+ - pick manpage from help2man, provide all xfwm4 options. closes: #632714
+ - correct the doc path in the "See Also" section. closes: #632709
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 04 Sep 2011 22:12:56 +0200
+
+xfwm4 (4.8.1-3) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control:
+ - drop Emanuele, Simon and Michael from uploaders, thanks to them.
+ - update standards version to 3.9.2.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 16:45:48 +0200
+
+xfwm4 (4.8.1-2) experimental; urgency=low
+
+ * debian/control:
+ - update xfconf build-dep to 4.8.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 07 Mar 2011 08:03:27 +0100
+
+xfwm4 (4.8.1-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream bugfix release.
+ * debian/control: add myself to Uploaders.
+ * debian/rules: stop overridding libexecdir; no need to pass
+ --enable-compositor, it's already the default nowadays.
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/control:
+ - update standards version to 3.9.1.
+ - refresh build-deps for Xfce 4.7.
+ - build-conflicts against libxfcegui4-dev to be sure to pick kbd headers
+ from libxfce4ui-dev.
+ - add build-dep on hardening-includes.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add hardening flags to {C,LD}FLAGS.
+ - drop useless chrpath call.
+ * add an xfwm4-dbg package.
+ * debian/copyright updated for new release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 14 Feb 2011 23:25:11 +0100
+
+xfwm4 (4.6.2-1) unstable; urgency=low
+
+ [ Stefan Ott ]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/control
+ - update standards version to 3.8.4.
+ - add depends on ${misc:Depends}.
+ - debhelper build-dep bumped for overrides support.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - switch to tiny debhelper 7 rules.
+ * debian/docs: use dh_installdocs to install docs.
+ * debian/manpages: use dh_installman to install manpages.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 22 May 2010 19:04:10 +0200
+
+xfwm4 (4.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 19 Apr 2009 18:30:15 +0200
+
+xfwm4 (4.6.0-2) unstable; urgency=low
+
+ * Upload to unstable, and mark fixed bugs as such:
+ - warn user about shortcut conflicts. closes: #370482
+ - allow user to disable blinking windows (in accessibility) closes: #500949
+ - keyboard shortcut themes don't exist in 4.6 anymore, this closes: #434480
+ - mouse position after wrap follows the wrap distance. closes: #380480
+ * debian/rules:
+ - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+ - install manpages using dh_installman.
+ * debian/compat bumped to 7.
+ * debian/control:
+ - update standards version to 3.8.1.
+ - move to xfce section.
+ * add manpages for all binaries.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 04 Apr 2009 01:35:58 +0200
+
+xfwm4 (4.6.0-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ [ Xfce 4.6 Alpha “Pinkie”]
+ * new upstream alpha release.
+ * debian/control:
+ - update standards version to 3.8.0.
+ - update build dep for Xfce 4.6 Alpha release.
+ - remove build dep on quilt.
+ - add build dep on intltool.
+ * debian/patches:
+ - 01_filter-grab-ungrab-events dropped, merged upstream.
+ - 02_exit-on-selectionclear too.
+ - 03_fix-compositing-overlay as well.
+ - 04_fix-automaximize-on-move ...
+ - 05_awn-focus.patch finally.
+ * debian/rules, debian/lintian:
+ - remove all references to mcs.
+ - remove references to quilt.
+ - stop messing with config.{guess,sub}.
+
+ [ Xfce 4.6 Beta 1 “Fuzzy”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Fuzzy.
+
+ [ Xfce 4.6 Beta 2 “Hopper”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for Hopper.
+ * debian/patches:
+ - 01_fix-maximize-bug, fix maximization bug. closes: #508352
+
+ [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+ * new upstream beta release.
+ * debian/control:
+ - update build-deps for “Tuco-Tuco”.
+ * debian/rules:
+ - replace dh_clean -k by dh_prep.
+ - install NEWS file.
+
+ [ Xfce 4.6 RC1 “Capybara” ]
+ * new upstream release candidate.
+ * debian/control:
+ - update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ - fix various compositing issues. closes: #483070
+ - fix support for win_gravity wm hint. closes: #448443
+ - fix iconification with skip_taskbar. closes: #491817
+ * debian/control:
+ - update build-deps for 4.6.
+ - bump build-dep on debhelper for dh_prep.
+ - drop build-dep on quilt, now useless.
+ * debian/copyright:
+ - update dates, copyrights and licensing informations.
+ * debian/patches:
+ - 01_fix-maximize-bug dropped, merged upstream.
+ * debian/rules:
+ - remove calls to quilt patch rules
+
+ [ Michael Casadevall ]
+ [ Xfce 4.6 Beta 1 "Fuzzy" ]
+ * debian/rules:
+ - Added --libexecdir=\$${prefix}/lib to compily with Debian policy
+ * debian/control:
+ - Added myself to uploaders
+
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 28 Feb 2009 13:41:49 +0100
+
+xfwm4 (4.4.2-5) unstable; urgency=low
+
+ * switch to triggers:
+ - debian/{postinst,prerm}: remove xfce-mcs-manager refresh.
+ - debian/control: version the Recommends: on xfce4-mcs-manager.
+ * debian/control:
+ - remove Martin Loschwitz from Uploaders.
+ - drop Conflicts/Replaces against old xfwm4-themes not in Etch.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 18 May 2008 19:58:55 +0200
+
+xfwm4 (4.4.2-4) unstable; urgency=low
+
+ * debian/patches:
+ - 01_filter-grab-ungrab-events added, prevents redrawing the frame twice.
+ (Xfce r26363).
+ - 02_exit-on-selectionclear added, improve “--replace” protocol.
+ (Xfce #2374 and r26585).
+ - 03_compositing-overlay added, fix compositing with overlay
+ windows (video players and screensavers).
+ Xfce #3849, taken from r26691. closes: #476396
+ - 04_fix-automaximize-on-move added. (Xfce r26966)
+ - 01_awn-focus moved to 05_awn-focus.
+ * debian/copyright: update dates.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 17 May 2008 16:58:28 +0200
+
+xfwm4 (4.4.2-3) unstable; urgency=low
+
+ * debian/patches: 01_awn-focus added, fix focus problems with
+ avant-window-navigator in some cases. Xfce #3439. closes: #463647
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 28 Mar 2008 23:52:59 +0100
+
+xfwm4 (4.4.2-2) unstable; urgency=low
+
+ * debian/watch: narrow regexp so we don't match xfwm4-themes. Thanks
+ Antonio Terceiro. closes: #462462
+ * debian/control:
+ - updated my email address.
+ - updated standards version to 3.7.3 (no changes needed).
+ * debian/copyright: use © sign.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 02 Mar 2008 01:18:01 +0100
+
+xfwm4 (4.4.2-1) unstable; urgency=low
+
+ [ Simon Huggins ]
+ * Use kill -s to keep Hurd and lintian happy at the same time.
+ * debian/control: Move fake Homepage field to a real one now dpkg
+ supports it.
+ * Add Vcs-* headers to debian/control
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/patches:
+ - 01_xfwm4-fix-transient-windows.patch removed, included upstream.
+ - 02_fix-xfwm4-hang.patch removed, included upstream.
+ * debian/rules: fix parallel builds.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 02 Dec 2007 11:33:02 +0100
+
+xfwm4 (4.4.1-3) unstable; urgency=high
+
+ * debian/xfwm4.1: update bugs reporting in manpage.
+ * debian/xfwm4.menu: switch to new menu policy.
+ * debian/postinst: use posix kill -s to avoid problems on hurd.
+ * debian/rules: enable output of distclean target.
+ * debian/lintian: ignore safe lintian warnings.
+ * debian/patches/02_fix-xfwm-hang.patch added to fix deadlock with gtk 2.12
+ urgency=high because gtk 2.12 entered archive so we need to reach testing
+ before it does.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Fri, 21 Sep 2007 08:43:40 +0200
+
+xfwm4 (4.4.1-2) unstable; urgency=low
+
+ * debian/patches: 01_xfwm4-fix-transient-windows.patch added to correct
+ behavior with transient windows. closes: #367616
+ * switch from dpatch to quilt.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Tue, 26 Jun 2007 23:41:22 +0200
+
+xfwm4 (4.4.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: added versionned build-dep against gtk 2.10.
+ * debian/copyright: update copyright holders.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sun, 15 Apr 2007 15:28:17 +0100
+
+xfwm4 (4.4.0-1) experimental; urgency=low
+
+ (Yves-Alexis Perez)
+ * New upstream release. closes: #390462, #379442, #380639
+ * debian/control:
+ - updated build-deps against Xfce 4.4.
+ - recommends librsvg2-common so svg icons are preferred over png ones.
+
+ (Emanuele Rocca)
+ * debian/rules: s/theme=microdeck2/theme=curve/ removed to keep upstream's
+ /usr/share/xfwm4/defaults
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 29 Jan 2007 12:08:33 +0100
+
+xfwm4 (4.3.99.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 16:37:06 +0100
+
+xfwm4 (4.3.99.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+ * Cycle windows keybinding is back. Closes: #370310
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 13:43:51 +0100
+
+xfwm4 (4.3.90.2-2) unstable; urgency=low
+
+ * Add upstream patch to fix mouse focus grab.
+ See http://bugzilla.xfce.org/show_bug.cgi?id=2022
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Tue, 25 Jul 2006 09:59:09 +0200
+
+xfwm4 (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:26:50 +0200
+
+xfwm4 (4.3.90.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 03 May 2006 18:35:05 +0100
+
+xfwm4 (4.2.3.2-2) unstable; urgency=low
+
+ * Add patch to fix moving windows to other workspaces closes: #341058
+
+ -- Simon Huggins <huggie at earth.li> Thu, 05 Jan 2006 00:41:18 +0000
+
+xfwm4 (4.2.3.2-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
+
+xfwm4 (4.2.2-1) unstable; urgency=low
+
+ * New Upstream Release
+ * Remove Build-Depends on libstartup-notification0-dev as this should be
+ satisfied via libxfce4gui-dev now
+ * Change suite to unstable
+
+ -- Simon Huggins <huggie at earth.li> Sat, 18 Jun 2005 09:45:36 +0100
+
+xfwm4 (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
+
+xfwm4 (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 17:01:33 +0000
+
+xfwm4 (4.2.0-1) experimental; urgency=low
+
+ * New Upstream Release
+
+ -- Simon Huggins <huggie at earth.li> Sat, 15 Jan 2005 13:41:19 +0000
+
+xfwm4 (4.1.99.1-1) experimental; urgency=low
+
+ * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1)
+ * ML: rules: example.xfwm4rc is gone, don't try to install it
+
+ -- Martin Loschwitz <madkiss at debian.org> Fri, 19 Nov 2004 17:23:00 +0100
+
+xfwm4 (4.0.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Remove Norbert Tretkowski as requested
+ * Improve description
+ * Suggests: xfce4
+
+ -- Simon Huggins <huggie at earth.li> Sat, 24 Jul 2004 18:29:50 +0100
+
+xfwm4 (4.0.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Update upstream's libtool
+ * Correct path in manpage
+ * Add recommends on xfce4-mcs-manager the settings manager
+ * Add depends on libstartup-notification0
+
+ -- Simon Huggins <huggie at earth.li> Sun, 02 May 2004 19:12:09 +0100
+
+xfwm4 (4.0.3.1-2) unstable; urgency=low
+
+ * Update libtool
+ * Just adding Daniel wasn't enough. Add self to Uploaders so katie doesn't
+ think this is an NMU again.
+
+ -- Simon Huggins <huggie at earth.li> Tue, 09 Mar 2004 13:56:19 +0000
+
+xfwm4 (4.0.3.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Add Daniel Silverstone <dsilvers at debian.org> to Uploaders as approved by
+ madkiss
+ * Add a manpage for xfwm4 referring to the packaged docs
+ closes: #226032, #188734
+ * Remove .la and .a files from mcs-plugins dir
+ * Quote needs in menu for lintian
+ * Thanks to Daniel for checking and uploading these packages
+
+ -- Simon Huggins <huggie at earth.li> Wed, 25 Feb 2004 12:11:05 +0000
+
+xfwm4 (4.0.2-2) unstable; urgency=low
+
+ * Fixed Recommends/Replaces stuff in debian/control
+
+ -- Martin Loschwitz <madkiss at debian.org> Sat, 27 Dec 2003 12:25:00 +0100
+
+xfwm4 (4.0.2-1) unstable; urgency=low
+
+ * Acknowledging NMU (Closes:#211804)
+ * New Upstream release
+
+ -- Martin Loschwitz <madkiss at debian.org> Fri, 26 Dec 2003 16:17:00 +0100
+
+xfwm4 (4.0.0.final-1.1) unstable; urgency=low
+
+ * NMU
+ * remove --slave part from "update-alternatives --remove" in prerm
+ (Closes:#211804)
+
+ -- Guido Guenther <agx at debian.org> Thu, 20 Nov 2003 12:14:48 +0100
+
+xfwm4 (4.0.0.final-1) unstable; urgency=low
+
+ * New Upstream release.
+ * New Co-Maintainer: Norbert Tretkowski.
+ * Various cleanups in debian/ subdirectory.
+ * Deleted xfwm4-themes, has its own source package now.
+ * Bumped Standards-Version to 3.6.1 (no changes).
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 29 Sep 2003 16:58:00 +0200
+
+xfwm4 (4.0.0+cvs.20030421-1) unstable; urgency=low
+
+ * New CVS checkout (2003-04-21)
+
+ -- Martin Loschwitz <madkiss at debian.org> Mon, 21 Apr 2003 19:33:00 +0100
+
+xfwm4 (4.0.0+cvs.20030301-1) unstable; urgency=low
+
+ * New CVS checkout (Using Xfce CVS, 2003-03-01)
+ * Official release (really this time!) (last release was never made public)
+ * debian/control: Changed Maintainer e-mail address
+
+ -- Martin Loschwitz <madkiss at debian.org> Sat, 01 Mar 2003 14:09:00 +0100
+
+xfwm4 (4.0.0+cvs.20030216-1) unstable; urgency=low
+
+ * New CVS checkout (Using Xfce CVS, 2003-02-16)
+ * Official release (last release was never made public)
+
+ -- Martin Loschwitz <madkiss at madkiss.org> Sun, 16 Feb 2003 12:57:00 +0100
+
+xfwm4 (4.0.0+cvs.20030119-1) unstable; urgency=low
+
+ * New CVS checkout (Using Xfce4 cvs, 2003-01-19)
+ * debian/control: Use Xft2
+ * debian/control: Build depend on libxfce4-mcs
+ * debian/control: Suggest xfce-mce-manager
+
+ -- Martin Loschwitz <madkiss at madkiss.org> Sun, 19 Jan 2003 14:52:00 +0100
+
+xfwm4 (4.0.0+cvs.20021222-1) unstable; urgency=low
+
+ * New CVS checkout (Using Xfce4 cvs, 2002-12-22)
+ * debian/rules: Install example configuration file into doc-dir
+ * debian/control: Changed some Recommends: to Suggests:
+ * debian/xfwm4-themes.install: Added new theme koynacity
+
+ -- Martin Loschwitz <madkiss at madkiss.org> Sun, 22 Dec 2002 14:09:00 +0100
+
+xfwm4 (4.0.0+cvs.20021127-1) unstable; urgency=low
+
+ * Initial Release. (Closes: #166641)
+
+ -- Martin Loschwitz <madkiss at madkiss.org> Wed, 27 Nov 2002 15:14:00 +0100
Deleted: desktop/tags/xfwm4/4.8.2-1/debian/compat
===================================================================
--- desktop/trunk/xfwm4/debian/compat 2011-10-07 18:12:15 UTC (rev 6103)
+++ desktop/tags/xfwm4/4.8.2-1/debian/compat 2011-10-11 12:33:41 UTC (rev 6115)
@@ -1 +0,0 @@
-7
Copied: desktop/tags/xfwm4/4.8.2-1/debian/compat (from rev 6112, desktop/trunk/xfwm4/debian/compat)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/compat (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/compat 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1 @@
+9
Deleted: desktop/tags/xfwm4/4.8.2-1/debian/control
===================================================================
--- desktop/trunk/xfwm4/debian/control 2011-10-07 18:12:15 UTC (rev 6103)
+++ desktop/tags/xfwm4/4.8.2-1/debian/control 2011-10-11 12:33:41 UTC (rev 6115)
@@ -1,42 +0,0 @@
-Source: xfwm4
-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 (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6),
- libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
- libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.8.0),
- libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libwnck-dev, intltool,
- hardening-includes
-Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
-Standards-Version: 3.9.2
-Homepage: http://www.xfce.org/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
-
-Package: xfwm4
-Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xfwm4-themes, librsvg2-common
-Suggests: xfce4
-Provides: x-window-manager
-Description: window manager of the Xfce project
- This package contains xfwm4 which is the window manager for Xfce4. It is
- designed to run with the rest of Xfce4 but makes a capable window manager
- for GNOME or KDE.
- .
- Install xfwm4 if you want a small, resource saving window manager which
- complies to the standards defined at http://www.freedesktop.org/. Without
- xfce4 installed this only gives you a window manager not the full
- environment.
-
-Package: xfwm4-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, xfwm4 (= ${binary:Version})
-Description: window manager of the Xfce project (debugging symbols)
- This package contains debugging symbols for xfwm4, the Xfce window manager.
- Install it if you need to debug issues in xfwm4.
Copied: desktop/tags/xfwm4/4.8.2-1/debian/control (from rev 6113, desktop/trunk/xfwm4/debian/control)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/control (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/control 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1,42 @@
+Source: xfwm4
+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: dpkg-dev (>= 1.16.1), debhelper (>= 8.9.4),
+ libgtk2.0-dev (>= 2.10.6),
+ libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
+ libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), libwnck-dev, intltool
+Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
+Standards-Version: 3.9.2
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfwm4/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
+
+Package: xfwm4
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: xfwm4-themes, librsvg2-common
+Suggests: xfce4
+Provides: x-window-manager
+Description: window manager of the Xfce project
+ This package contains xfwm4 which is the window manager for Xfce4. It is
+ designed to run with the rest of Xfce4 but makes a capable window manager
+ for GNOME or KDE.
+ .
+ Install xfwm4 if you want a small, resource saving window manager which
+ complies to the standards defined at http://www.freedesktop.org/. Without
+ xfce4 installed this only gives you a window manager not the full
+ environment.
+
+Package: xfwm4-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfwm4 (= ${binary:Version})
+Description: window manager of the Xfce project (debugging symbols)
+ This package contains debugging symbols for xfwm4, the Xfce window manager.
+ Install it if you need to debug issues in xfwm4.
Copied: desktop/tags/xfwm4/4.8.2-1/debian/patches/0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch (from rev 6111, desktop/trunk/xfwm4/debian/patches/0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/patches/0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/patches/0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1,346 @@
+From 41ce9e6b77ce2b601cc6cec46d29a6c59cebde82 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Fri, 7 Oct 2011 15:19:41 +0200
+Subject: [PATCH] Do not enforce the size increment only if the size request
+ comes from the application itself (refix bug #7445)
+
+---
+ src/client.c | 5 +-
+ src/moveresize.c | 136 +++++++++++++++++++-----------------------------------
+ src/moveresize.h | 6 ++-
+ 3 files changed, 55 insertions(+), 92 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 64bd2e7..67c5f36 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -666,11 +666,11 @@ clientConfigure (Client * c, XWindowChanges * wc, unsigned long mask, unsigned s
+ }
+ if (mask & CWWidth)
+ {
+- c->width = wc->width;
++ clientSetWidth (c, wc->width, flags & CFG_REQUEST);
+ }
+ if (mask & CWHeight)
+ {
+- c->height = wc->height;
++ clientSetHeight (c, wc->height, flags & CFG_REQUEST);
+ }
+ if (mask & CWBorderWidth)
+ {
+@@ -1834,6 +1834,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
+ (c->win_layer == WIN_LAYER_NORMAL) &&
+ (c->type == WINDOW_NORMAL))
+ {
++ g_print ("Full screen for old apps\n");
+ FLAG_SET (c->xfwm_flags, XFWM_FLAG_LEGACY_FULLSCREEN);
+ }
+
+diff --git a/src/moveresize.c b/src/moveresize.c
+index 0ee9ebf..0653ffa 100644
+--- a/src/moveresize.c
++++ b/src/moveresize.c
+@@ -77,48 +77,48 @@ struct _MoveResizeData
+ };
+
+ static void
+-clientComputeWidth (Client * c, int *w)
++clientSetSize (Client * c, int *size, int size_min, int size_max, int size_inc, gboolean source_is_application)
+ {
+- int w2;
++ int temp;
+
+ g_return_if_fail (c != NULL);
+- g_return_if_fail (w != NULL);
+- TRACE ("entering clientComputeWidth");
++ g_return_if_fail (size != NULL);
++ TRACE ("entering clientSetSize");
+
+ /* Bypass resize increment and max sizes for fullscreen */
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+ && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+ && (c->screen_info->params->borderless_maximize)))
+ {
+- if ((c->size->flags & PResizeInc) && (c->size->width_inc))
++ if (!source_is_application && (c->size->flags & PResizeInc) && (size_inc))
+ {
+- w2 = (*w - c->size->min_width) / c->size->width_inc;
+- *w = c->size->min_width + (w2 * c->size->width_inc);
++ temp = (*size - size_min) / size_inc;
++ *size = size_min + (temp * size_inc);
+ }
+ if (c->size->flags & PMaxSize)
+ {
+- if (*w > c->size->max_width)
++ if (*size > size_max)
+ {
+- *w = c->size->max_width;
++ *size = size_max;
+ }
+ }
+ }
+
+ if (c->size->flags & PMinSize)
+ {
+- if (*w < c->size->min_width)
++ if (*size < size_min)
+ {
+- *w = c->size->min_width;
++ *size = size_min;
+ }
+ }
+- if (*w < 1)
++ if (*size < 1)
+ {
+- *w = 1;
++ *size = 1;
+ }
+ }
+
+ void
+-clientSetWidth (Client * c, int w)
++clientSetWidth (Client * c, int w, gboolean source_is_application)
+ {
+ int temp;
+
+@@ -127,52 +127,12 @@ clientSetWidth (Client * c, int w)
+ TRACE ("setting width %i for client \"%s\" (0x%lx)", w, c->name, c->window);
+
+ temp = w;
+- clientComputeWidth (c, &temp);
++ clientSetSize (c, &temp, c->size->min_width, c->size->max_width, c->size->width_inc, source_is_application);
+ c->width = temp;
+ }
+
+-static void
+-clientComputeHeight (Client * c, int *h)
+-{
+- int h2;
+-
+- g_return_if_fail (c != NULL);
+- TRACE ("entering clientComputeHeight");
+-
+- /* Bypass resize increment and max sizes for fullscreen */
+- if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+- && !(FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+- && (c->screen_info->params->borderless_maximize)))
+- {
+- if ((c->size->flags & PResizeInc) && (c->size->height_inc))
+- {
+- h2 = (*h - c->size->min_height) / c->size->height_inc;
+- *h = c->size->min_height + (h2 * c->size->height_inc);
+- }
+- if (c->size->flags & PMaxSize)
+- {
+- if (*h > c->size->max_height)
+- {
+- *h = c->size->max_height;
+- }
+- }
+- }
+-
+- if (c->size->flags & PMinSize)
+- {
+- if (*h < c->size->min_height)
+- {
+- *h = c->size->min_height;
+- }
+- }
+- if (*h < 1)
+- {
+- *h = 1;
+- }
+-}
+-
+ void
+-clientSetHeight (Client * c, int h)
++clientSetHeight (Client * c, int h, gboolean source_is_application)
+ {
+ int temp;
+
+@@ -181,7 +141,7 @@ clientSetHeight (Client * c, int h)
+ TRACE ("setting height %i for client \"%s\" (0x%lx)", h, c->name, c->window);
+
+ temp = h;
+- clientComputeHeight (c, &temp);
++ clientSetSize (c, &temp, c->size->min_height, c->size->max_height, c->size->height_inc, source_is_application);
+ c->height = temp;
+ }
+
+@@ -273,7 +233,7 @@ clientSetHandle(MoveResizeData *passdata, int handle)
+
+ #define MAKE_MULT(a,b) ((b==1) ? (a) : (((int)((a)/(b))) * (b)) )
+ static void
+-clientConstrainRatio (Client * c, int *w, int *h, int handle)
++clientConstrainRatio (Client * c, int handle)
+ {
+
+ g_return_if_fail (c != NULL);
+@@ -291,59 +251,59 @@ clientConstrainRatio (Client * c, int *w, int *h, int handle)
+ maxx = c->size->max_aspect.x;
+ maxy = c->size->max_aspect.y;
+
+- if ((minx * *h > miny * *w) && (miny) &&
++ if ((minx * c->height > miny * c->width) && (miny) &&
+ ((handle == CORNER_COUNT + SIDE_TOP) || (handle == CORNER_COUNT + SIDE_BOTTOM)))
+ {
+ /* Change width to match */
+- delta = MAKE_MULT (minx * *h / miny - *w, xinc);
++ delta = MAKE_MULT (minx * c->height / miny - c->width, xinc);
+ if (!(c->size->flags & PMaxSize) ||
+- (*w + delta <= c->size->max_width))
++ (c->width + delta <= c->size->max_width))
+ {
+- *w += delta;
++ c->width += delta;
+ }
+ }
+- if ((minx * *h > miny * *w) && (minx))
++ if ((minx * c->height > miny * c->width) && (minx))
+ {
+- delta = MAKE_MULT (*h - *w * miny / minx, yinc);
++ delta = MAKE_MULT (c->height - c->width * miny / minx, yinc);
+ if (!(c->size->flags & PMinSize) ||
+- (*h - delta >= c->size->min_height))
++ (c->height - delta >= c->size->min_height))
+ {
+- *h -= delta;
++ c->height -= delta;
+ }
+ else
+ {
+- delta = MAKE_MULT (minx * *h / miny - *w, xinc);
++ delta = MAKE_MULT (minx * c->height / miny - c->width, xinc);
+ if (!(c->size->flags & PMaxSize) ||
+- (*w + delta <= c->size->max_width))
+- *w += delta;
++ (c->width + delta <= c->size->max_width))
++ c->width += delta;
+ }
+ }
+
+- if ((maxx * *h < maxy * *w) && (maxx) &&
++ if ((maxx * c->height < maxy * c->width) && (maxx) &&
+ ((handle == CORNER_COUNT + SIDE_LEFT) || (handle == CORNER_COUNT + SIDE_RIGHT)))
+ {
+- delta = MAKE_MULT (*w * maxy / maxx - *h, yinc);
++ delta = MAKE_MULT (c->width * maxy / maxx - c->height, yinc);
+ if (!(c->size->flags & PMaxSize) ||
+- (*h + delta <= c->size->max_height))
++ (c->height + delta <= c->size->max_height))
+ {
+- *h += delta;
++ c->height += delta;
+ }
+ }
+- if ((maxx * *h < maxy * *w) && (maxy))
++ if ((maxx * c->height < maxy * c->width) && (maxy))
+ {
+- delta = MAKE_MULT (*w - maxx * *h / maxy, xinc);
++ delta = MAKE_MULT (c->width - maxx * c->height / maxy, xinc);
+ if (!(c->size->flags & PMinSize) ||
+- (*w - delta >= c->size->min_width))
++ (c->width - delta >= c->size->min_width))
+ {
+- *w -= delta;
++ c->width -= delta;
+ }
+ else
+ {
+- delta = MAKE_MULT (*w * maxy / maxx - *h, yinc);
++ delta = MAKE_MULT (c->width * maxy / maxx - c->height, yinc);
+ if (!(c->size->flags & PMaxSize) ||
+- (*h + delta <= c->size->max_height))
++ (c->height + delta <= c->size->max_height))
+ {
+- *h += delta;
++ c->height += delta;
+ }
+ }
+ }
+@@ -1427,9 +1387,9 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ c->height = clientFindClosestEdgeY (c, c->y + c->height + frameBottom (c)) - c->y - frameBottom (c);
+ }
+ }
+- clientConstrainRatio (c, &c->width, &c->height, passdata->handle);
++ clientConstrainRatio (c, passdata->handle);
+
+- clientSetWidth (c, c->width);
++ clientSetWidth (c, c->width, FALSE);
+ if (move_left)
+ {
+ c->x = c->x - (c->width - passdata->oldw);
+@@ -1442,7 +1402,7 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ frame_x = frameX (c);
+ }
+
+- clientSetHeight (c, c->height);
++ clientSetHeight (c, c->height, FALSE);
+ if (!FLAG_TEST (c->flags, CLIENT_FLAG_SHADED) && move_top)
+ {
+ c->y = c->y - (c->height - passdata->oldh);
+@@ -1463,14 +1423,14 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ temp = c->y + c->height;
+ c->y = CLAMP (c->y, screen_info->margins [STRUTS_TOP] + frame_top,
+ MAX (disp_max_y - min_visible, screen_info->height - screen_info->margins [STRUTS_BOTTOM] - min_visible));
+- clientSetHeight (c, temp - c->y);
++ clientSetHeight (c, temp - c->y, FALSE);
+ c->y = temp - c->height;
+ }
+ else if (frame_y < 0)
+ {
+ temp = c->y + c->height;
+ c->y = frame_top;
+- clientSetHeight (c, temp - c->y);
++ clientSetHeight (c, temp - c->y, FALSE);
+ c->y = temp - c->height;
+ }
+ }
+@@ -1479,7 +1439,7 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ if (c->y + c->height < MAX (disp_y + min_visible, screen_info->margins [STRUTS_TOP] + min_visible))
+ {
+ temp = MAX (disp_y + min_visible, screen_info->margins [STRUTS_TOP] + min_visible);
+- clientSetHeight (c, temp - c->y);
++ clientSetHeight (c, temp - c->y, FALSE);
+ }
+ }
+ if (move_left)
+@@ -1488,7 +1448,7 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ {
+ temp = c->x + c->width;
+ c->x = MIN (disp_max_x - min_visible, screen_info->width - screen_info->margins [STRUTS_RIGHT] - min_visible);
+- clientSetWidth (c, temp - c->x);
++ clientSetWidth (c, temp - c->x, FALSE);
+ c->x = temp - c->width;
+ }
+ }
+@@ -1497,7 +1457,7 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
+ if (c->x + c->width < MAX (disp_x + min_visible, screen_info->margins [STRUTS_LEFT] + min_visible))
+ {
+ temp = MAX (disp_x + min_visible, screen_info->margins [STRUTS_LEFT] + min_visible);
+- clientSetWidth (c, temp - c->x);
++ clientSetWidth (c, temp - c->x, FALSE);
+ }
+ }
+
+diff --git a/src/moveresize.h b/src/moveresize.h
+index cd5c770..f6ffc9b 100644
+--- a/src/moveresize.h
++++ b/src/moveresize.h
+@@ -34,9 +34,11 @@
+ #ifndef INC_MOVERESIZE_H
+ #define INC_MOVERESIZE_H
+ void clientSetWidth (Client *,
+- int);
++ int,
++ gboolean);
+ void clientSetHeight (Client *,
+- int);
++ int,
++ gboolean);
+ void clientMove (Client *,
+ XEvent *);
+ void clientResize (Client *,
+--
+1.7.6.3
+
Copied: desktop/tags/xfwm4/4.8.2-1/debian/patches/series (from rev 6111, desktop/trunk/xfwm4/debian/patches/series)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/patches/series (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/patches/series 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1 @@
+0001-Do-not-enforce-the-size-increment-only-if-the-size-r.patch
Deleted: desktop/tags/xfwm4/4.8.2-1/debian/rules
===================================================================
--- desktop/trunk/xfwm4/debian/rules 2011-10-07 18:12:15 UTC (rev 6103)
+++ desktop/tags/xfwm4/4.8.2-1/debian/rules 2011-10-11 12:33:41 UTC (rev 6115)
@@ -1,16 +0,0 @@
-#!/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
-
-override_dh_strip:
- dh_strip --dbg-package=xfwm4-dbg
-
-%:
- dh $@
Copied: desktop/tags/xfwm4/4.8.2-1/debian/rules (from rev 6112, desktop/trunk/xfwm4/debian/rules)
===================================================================
--- desktop/tags/xfwm4/4.8.2-1/debian/rules (rev 0)
+++ desktop/tags/xfwm4/4.8.2-1/debian/rules 2011-10-11 12:33:41 UTC (rev 6115)
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+override_dh_strip:
+ dh_strip --dbg-package=xfwm4-dbg
+
+%:
+ dh $@
More information about the Pkg-xfce-commits
mailing list